Merge "Remove ZUUL_PROJECT" into feature/zuulv3