Merge "Remove ZUUL_COMMIT" into feature/zuulv3