Use more appropriate dependencies for Jetty (#13682)

Change-Id: Ic977ae403068e41a64eabc42cd00c4a933d02a95