Merge "Make tests' encrypt_secret.py work with python3" into feature/zuulv3