Merge "Filter volumes and snapshots by query string"

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_volumes.py
Simple merge

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