Merge "Cleanup unused conf variables"

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

diff --cc cinder/tests/unit/api/v1/test_snapshot_metadata.py
Simple merge

diff --cc cinder/tests/unit/api/v2/test_snapshot_metadata.py
Simple merge