Fix try-with-resources statement in Java 7
Merge branch 'java-try' of https://github.com/Keepun/uncrustify into Keepun-java-try
Clean up whitespace from merge