Merge "Don't use hypervisor_hostname as compute hostname" into mcp/queens