Merge "Update quota when volume type renames"

diff --cc cinder/db/api.py
Simple merge

diff --cc cinder/db/sqlalchemy/api.py
Simple merge

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

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

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

diff --cc cinder/volume/volume_types.py
Simple merge