Merge "Fix branch-based caching of unparsed config" into feature/zuulv3