Merge "cinder-api-microversions code"

diff --cc cinder/api/openstack/wsgi.py
Simple merge

diff --cc cinder/exception.py
Simple merge

diff --cc cinder/opts.py
index dc674dd599c8f67d5cf472daaaad26218e70f253,5d96618b09fc23914cd61dc30fbe15628a34266f..aebbfd072b50dfb13b43a68d2cf63505c4f9ee4a
--- 1/cinder/opts.py
--- 2/cinder/opts.py
+++ b/cinder/opts.py
@@@ -17,9 -17,7 +17,8 @@@ import itertool
  from cinder.api import common as cinder_api_common
  from cinder.api.middleware import auth as cinder_api_middleware_auth
  from cinder.api.middleware import sizelimit as cinder_api_middleware_sizelimit
- from cinder.api.v2 import volumes as cinder_api_v2_volumes
  from cinder.api.views import versions as cinder_api_views_versions
 +from cinder.backup import api as cinder_backup_api
  from cinder.backup import chunkeddriver as cinder_backup_chunkeddriver
  from cinder.backup import driver as cinder_backup_driver
  from cinder.backup.drivers import ceph as cinder_backup_drivers_ceph

diff --cc cinder/tests/unit/api/openstack/test_wsgi.py
Simple merge

diff --cc cinder/tests/unit/test_utils.py
Simple merge

diff --cc cinder/utils.py
Simple merge