Merge "Retain existing ComputeHostnameFormat when upgrading older envs"