Incorporate Jetty 12.1

[jmcc0nn3ll]

A couple of different ways this could go, largely dependent on what approach we take with 12.1 completely replacing 12.0 or if we need to maintain 12.0 and 12.1 for some period of time.