Jetty

Change jetty-8 merge rules for fragment descriptors and annotations