CLOUDSTACK-4073: fix s3 on vmware

Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java