Merge "Do not clone non-raw images in rbd backend"

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

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

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

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

diff --cc cinder/volume/drivers/netapp/nfs.py
Simple merge

diff --cc cinder/volume/flows/create_volume/__init__.py
Simple merge