Fix to make BlockStorageUtil not SC-colocation dependent. Fixes EUCA-7286
Merge branch 'maint/3.3/testing' of git.eucalyptus-systems.com:eucalyptus into maint/3.3/testing
Merge branch 'maint/3.3/testing' of git.eucalyptus-systems.com:eucalyptus into maint/3.3/testing