Merge "Remove ZUUL_PATCHSET" into feature/zuulv3