Merge "Explicitly decode decrypted secrets for py3" into feature/zuulv3