Merge "Write secrets into their own file, not into inventory" into feature/zuulv3