CLOUDSTACK-6170 (VMware root-disk support for managed storage)
Revert "change below file names for consistency"

This reverts commit 9493b4d65cdf50a93913176fe69e63bb1a47e3d1.