One more minor update to CXFNonSpringJaxrsServlet and the demo

git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1519671 13f79535-47bb-0310-9956-ffa450edef68
One more minor update to CXFNonSpringJaxrsServlet and the demo, forgot the demo update

git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1519672 13f79535-47bb-0310-9956-ffa450edef68