CLOUDSTACK-3869: make new folder structure to work with Create/Delete/Attach/Detach commands
CLOUDSTACK-3869: make new folder structure to work with Snapshop commands
CLOUDSTACK-3869: change default snapshot directory to VM folder
CLOUDSTACK-3869: fix merge conflicts
CLOUDSTACK-4109: fix upload volume to s3 for vmware