Merge "Add some information about canonical_hostname" into feature/zuulv3