Merge "Replace dict.iteritems() with dict.items()"

diff --cc cinder/exception.py
Simple merge

diff --cc cinder/tests/unit/test_netapp.py
Simple merge

diff --cc cinder/tests/unit/test_netapp_ssc.py
Simple merge

diff --cc cinder/volume/drivers/cloudbyte/cloudbyte.py
Simple merge

diff --cc cinder/volume/drivers/huawei/rest_common.py
Simple merge

diff --cc cinder/volume/drivers/san/hp/hp_3par_common.py
Simple merge

diff --cc cinder/volume/drivers/solidfire.py
Simple merge