Revert "Remove Java stuff as that was not part of this PR."

This reverts commit 5e676dc709297602c6fdfe1e5a23acfecaef8646.
Merge b1 & b2 patches
Ensure inode is correctly identified on Windows