Merge pull request #957 from hazendaz/java.io.fixes

For maven 4, add an empty .mvn folder using .gitkeep so git retains it