Remove Java 7 diamond operator and try-with-resources to allow common
and server components to compile as Java 6. Allows server-side
components using this toolkit to run under Java 6, even though special
measures will need to be taken to downgrade Jetty to 8.x.