Merge r831524 from trunk to m4 to Update to not relocate a servlet if it already includes the context path in its mapping
tuscany/branches/sca-java-2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java