Merge "Remove str() from LOG.* and exceptions"

diff --cc cinder/utils.py
Simple merge

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

diff --cc cinder/volume/drivers/emc/emc_smis_common.py
Simple merge

diff --cc cinder/volume/drivers/ibm/storwize_svc/__init__.py
Simple merge

diff --cc cinder/volume/drivers/ibm/storwize_svc/helpers.py
Simple merge

diff --cc cinder/volume/drivers/ibm/storwize_svc/ssh.py
Simple merge

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

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