fix for ESBJAVA-3099
VFS bug fixes
Merge pull request #10 from malakasilva/master

Fix for ESBJAVA-3099