Make rbd.libvirt_info parent class compatible

Rbd.libvirt_info function definition misses hypervisor_version argument added in change:
https://review.openstack.org/32379

Closes-Bug: #1233188
Change-Id: Ib68d743e783af0f6d82d2ba180869ee642e86050
(cherry picked from commit 7a34be0ec0cd0cb9555fe64ff6c486faae1ae91d)
neutron_metadata_proxy_shared_secret should not be written to log file

This patch sets secret=True for the following config option
neutron_metadata_proxy_shared_secret

Conflicts:

	nova/api/metadata/handler.py

Change-Id: I381ea9e89f76beac11b03def6e3ccfee2a55e48f
Closes-bug: #1288463
(cherry picked from commit fa73a5d037471dbec11893ad83bd93276968b9af)
VMware: fix the VNC port allocation

There is small chance for VNC port collisions with the current
implementation which choose the port number based on the MoRef id
of the VM.
This patch fixes this by running a query for all allocated ports
and then selects one which is not taken.

Closes-Bug: #1255609
(cherry picked from commit 2f49ed4b5dbb5c954fc7a9b42ee7b170c38c775c)

Conflicts:

	nova/exception.py
	nova/tests/virt/vmwareapi/test_vmwareapi.py
	nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py
	nova/virt/vmwareapi/vm_util.py
	nova/virt/vmwareapi/vmops.py

Change-Id: If7c3b14dd49ed05c5fde819c5a36d5608650cbbc
Merge "Make rbd.libvirt_info parent class compatible" into stable/havana
Merge "neutron_metadata_proxy_shared_secret should not be written to log file" into stable/havana
Merge "VMware: fix the VNC port allocation" into stable/havana
Merge remote-tracking branch 'upstream/stable/havana' into stable/havana