Merge "Remove ZUUL_CHANGE" into feature/zuulv3