Merge "Fail execution if a role repo is a bare collection of roles" into feature/zuulv3