remerge pom changes to fix jetty