Merge "Use uwsgi for nova when NOVA_USE_MOD_WSGI is not False"