Merge "Fail early if people attempt to add zuul vars or secrets" into feature/zuulv3