Upgraded dependency versions
Upgraded Jetty and CXF
Merge branch 'master' into upgrade-versions
Removed unnecessary tags
Merge branch 'upgrade-versions'
Upgraded dependency versions