fix jetty
Merge branch 'upgrade-infrastructure' into docker