Fixed merge conflicts
updating jetty8 plugin, not work, having issues with slf4j.