Merge "Improve Cinder API internal cache interface"

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

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

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

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

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

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