update jetty
Merge branch '1.12'