Merge "Support project configs in multiple locations" into feature/zuulv3