Merge "Add finish_volume_migration to volume object"

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

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

diff --cc cinder/tests/unit/objects/test_objects.py
Simple merge

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