CLOUDSTACK-4109: fix upload volume to s3 for vmware
CLOUDSTACK-4108: fix create template from snapshot for vmware& s3