Merge "Cleanup for SnapshotObject"

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

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

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

diff --cc cinder/tests/unit/test_volume_utils.py
index 8baecd4c3db7e372040b37c871cdafd7726e8a5f,92cc672694d4ad7ed853bc134da11d14cc72cbcf..508e69070f3ef1518da1e7844254d981a3a19e22
--- 1/cinder/tests/unit/test_volume_utils.py
--- 2/cinder/tests/unit/test_volume_utils.py
+++ b/cinder/tests/unit/test_volume_utils.py
@@@ -17,8 -17,8 +17,9 @@@
  
  
  import datetime
 +import io
  import mock
+ import six
  
  from oslo_concurrency import processutils
  from oslo_config import cfg

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

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

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

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