Merge "Fix tempest init inconsistency when it fails"