Merge "Remove ZUUL_REFNAME" into feature/zuulv3