Merge "Fix V2 hypervisor server schema attribute"