Merge "Remove ZUUL_URL" into feature/zuulv3