Merge "Make sure we have installed python_novaclient==6.0.0"