Merge "Make encrypt_secret.py work with OpenSSL 0.x" into feature/zuulv3