Merge r831664 from trunk to m4 to Add the Jetty plugin to the webapp pom.xml's so that the samples can be run with mvn jetty:run