Merge "Fix getting wwpn information in infortrend driver for DS4000"

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

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

diff --cc cinder/volume/drivers/infortrend/eonstor_ds_cli/common_cli.py
Simple merge

diff --cc cinder/volume/drivers/infortrend/infortrend_fc_cli.py
Simple merge

diff --cc cinder/volume/drivers/infortrend/infortrend_iscsi_cli.py
Simple merge