Manually patched carry-over of Mike Munn's fix for EUCA-6995.

Original fix was in the storage-san repo and did not get merged into
the eucalyptus repo after the code refactor that brought some of the
SAN code into the open-source side.

This commit is the manually applied patches from mmunn's 2 fixes:

e98e9d0f4259269e02ed949c748c40cec8331452
and
cf96455473d6177d01c5431713dd36739a9b53fd

in the storage-san repo.
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing