WSDL endpoint address incorrect when publishing similar endpoints through a servlet

This issue is very similar to the problem described in issue CXF-793, but that is supposed to have been fixed in 2.0.4.
This issue might relate to the use of servlets.

When multiple published endpoints use the same WSDL, the served WSDLs (?wsdl) don't get the correct endpoint adress.

I am subclassing CXFServlet and deploy multiple endpoints using the API as described in the docs:
Endpoint.publish("/Greeter", new GreeterImpl());
Endpoint.publish("/Greeter2", new GreeterImpl());

In all the endpoints, the generated WSDL specifies soap:address location pointing to the last endpoint listed in the service list.

The same happens using cxf-servlet.xml.

Steps to reproduce:

• Use sample "wsdl_first"
• Edit cxf-servlet.xml: duplicate the <jaxws:endpoint> section, change id and address in the copy
• Build WAR
• Deploy on Tomcat
• Check the generated WSDLs

The WSDLs are supposed to point to different adresses, right?
In my test they don't.

Regards,
– Kim