Merge branch 'master' into feature-shared-vol
add nil checks.
Merge pull request #337 from axsh/feature-shared-vol

Fix broken iSCSI shared storage support.
Merge branch 'master' into feature-indelibe-fs-v3

Conflicts:
	dcmgr/lib/dcmgr/models/volume.rb