Merge "Remove ZUUL_UUID" into feature/zuulv3