Added hypervisor metadata and characteristics.
Merge branch 'test' into dev