CLOUDSTACK-4757. Cleanup datadisk templates that have already been created in case creation of one of the datadisk template fails
CLOUDSTACK-4757. Improvements to the marvin test.