Merge "Remove ZUUL_PIPELINE" into feature/zuulv3