Merge "Validate outermost request body element name consistently"

diff --cc cinder/api/contrib/backups.py
Simple merge

diff --cc cinder/api/contrib/cgsnapshots.py
Simple merge

diff --cc cinder/api/contrib/consistencygroups.py
Simple merge

diff --cc cinder/api/contrib/qos_specs_manage.py
Simple merge

diff --cc cinder/api/contrib/quotas.py
Simple merge

diff --cc cinder/api/contrib/services.py
Simple merge

diff --cc cinder/api/contrib/types_extra_specs.py
Simple merge

diff --cc cinder/api/contrib/types_manage.py
Simple merge

diff --cc cinder/api/contrib/volume_manage.py
Simple merge

diff --cc cinder/api/contrib/volume_type_access.py
Simple merge

diff --cc cinder/api/contrib/volume_type_encryption.py
Simple merge

diff --cc cinder/api/v2/snapshots.py
Simple merge

diff --cc cinder/api/v2/volume_metadata.py
Simple merge

diff --cc cinder/api/v2/volumes.py
Simple merge

diff --cc cinder/tests/unit/api/contrib/test_backups.py
Simple merge

diff --cc cinder/tests/unit/api/contrib/test_cgsnapshots.py
Simple merge

diff --cc cinder/tests/unit/api/contrib/test_consistencygroups.py
Simple merge

diff --cc cinder/tests/unit/api/contrib/test_volume_type_encryption.py
Simple merge