Merge "Add LIO iSCSI backend support using python-rtslib"

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

diff --cc setup.py
Simple merge

diff --cc tools/test-requires
index aa1ef040269bc840d3003e4cca458967cf232a6f,cc907a4c11cb5dba12346580c9dd3e3b53003d51..8f3b67a9462ff2887d8cc358292d1d0e22396c96
--- 1/tools/test-requires
--- 2/tools/test-requires
+++ b/tools/test-requires
@@@ -9,7 -9,7 +9,8 @@@ openstack.nose_plugi
  nosehtmloutput
  pep8==1.3.3
  pylint==0.25.2
+ rtslib>=2.1.fb27
  sphinx>=1.1.2
  MySQL-python
 +psycopg2
  hp3parclient>=1.0.0