Merge pull request #2271 from revel8n/fixes Fix for alignment of zero-length files within directory based virtual disk