Merge "CG driver function should not access db"

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

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

diff --cc cinder/volume/drivers/dell/dell_storagecenter_common.py
Simple merge

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

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