Merge "Migration for detached volumes with no snaps."

diff --cc cinder/db/sqlalchemy/api.py
Simple merge

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

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

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

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