Merge "Add update to volume and snapshot controllers"

diff --cc cinder/api/openstack/volume/snapshots.py
Simple merge

diff --cc cinder/api/openstack/volume/volumes.py
Simple merge

diff --cc cinder/tests/api/openstack/volume/test_snapshots.py
Simple merge

diff --cc cinder/tests/api/openstack/volume/test_volumes.py
Simple merge

diff --cc cinder/tests/test_volume.py
Simple merge

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