Update to use Jetty 9
Merge branch 'master' into unimelb
Default name is Short URL
Merge unimelb with master