Make JettyLoggerAdapter handle string formatting errors
Merge remote-tracking branch 'upstream/1.9-maint'