Merge "Add --strip option to encrypt_secret.py" into feature/zuulv3