reverting Merge branch 'master' into jetty