Add support for LinkOptions to directory? for java 7+
Add support for LinkOptions to delete-dir for java 7+
Fix merge conflicts.