PDI-7300 - Changing to the commons-vfs with our fixes