Copying minor updates to CXFNonSpringJaxrsServlet 3.0.x  made as part of bigger changes on the trunk