CLOUDSTACK-6158: Fix few changes
CLOUDSTACK-6160: Changes to marvin apiclient

Removed apiclient.hypervisor references. More details in the bug
Few other changes pending for this related to VirtualMachine.create
need to be cleaned up