Merge "Add canonical hostname to source object" into feature/zuulv3