Merge "Add secret top-level config object" into feature/zuulv3