Merge "Use hypervisor_hostname as name of node in scheduling" into mcp/caracal