Merge "Re-use common volume create/attach methods in test_iscsi_volume"