Rebase of OpenStack/NeCTAR port over latest upstream