We also need to update the jetty client libs we use but this requires a different issue and there are potential issues with Solr.
It's not really doable in 16.x.