Merge "I/O rate limit for volume copy with qemu-img convert"

diff --cc cinder/image/image_utils.py
Simple merge

diff --cc cinder/tests/test_image_utils.py
index d1fe46bfb571bb3f1175272fd1f553632c037166,39666bd30c1f9e08ed9d656132397f5df239e4a4..f06cd904de5b20d370e7860459814ad21508e094
--- 1/cinder/tests/test_image_utils.py
--- 2/cinder/tests/test_image_utils.py
+++ b/cinder/tests/test_image_utils.py
@@@ -23,9 -25,12 +25,12 @@@ from cinder import contex
  from cinder import exception
  from cinder.image import image_utils
  from cinder.openstack.common import processutils
 +from cinder.openstack.common import units
  from cinder import test
 -from cinder import units
  from cinder import utils
+ from cinder.volume import utils as volume_utils
+ 
+ CONF = cfg.CONF
  
  
  class FakeImageService: