Upgrade to jetty 9

Change-Id: I1cca83fc30159c5394a887cf348bee45e2d27ea4
Minor fixes..

Change-Id: Idd9ea57c1cc96aaf49feaf794a286424a7e3e832