Merge r831523 from trunk to m4 to fix WS binding to include any webapp context path in the wsdl endpoint