Update JUnit to 4.12 and Jetty to 8.1.16
Set version to 6.18.1