Merge "Fix hypervisor schema for hypervisor status extension"