Merge "Added provider_id to volume and snapshot object"

diff --cc cinder/objects/snapshot.py
Simple merge

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

diff --cc cinder/tests/objects/test_snapshot.py
Simple merge

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