Upgrade jetty-maven-plugin version
Upgrade jetty-maven-plugin version
Merge branch 'master' into groups_and_roles_together