Merge "Clarify canonical_hostname documentation" into feature/zuulv3