fixes needed for jetty 9
wip
some adjustments for running tests etc on jetty 9