Added option to select custom hostnames ips for the hypervisor.
Merge branch 'test' into dev