Change cinder client version to 2 for integration tests
Change cinder client version to 2 for integration tests

Change-Id: Ib6c9029524838cbfbadf2c3fee6c9b50e8eef2b0
Depends-On: I5c4485a0f1d89a63548b627502be99ce30c0f00b
Closes-Bug: #1500714

noironetworks/heat,jasondunsmore/heat,pratikmallya/heat,maestro-hybrid-cloud/heat,dragorosson/heat,noironetworks/heat,jasondunsmore/heat,maestro-hybrid-cloud/heat,cwolferh/heat-scratch,steveb/heat,gonzolino/heat,cwolferh/heat-scratch,gonzolino/heat,pratikmallya/heat,dims/heat,openstack/heat,steveb/heat,openstack/heat,dims/heat,dragorosson/heat