ACCUMULO-2301 Add Jetty to packaging

Add Jetty to packaging list. Remove duplicate entry in server pom.
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT