I would appreciate it if you could apply #2062 to the 1.10.x-jetty9 branch as well so that it can be built on 1.10.x.
