Self link has wrong URL for module resources

When using the addSelfLink method of DelegatingPropertyDescription, the wrong URL is provided. Here is what comes back:

<org.openmrs.module.webservices.rest.web.Hyperlink>
<rel>self</rel>
<uri>
http://localhost:8080/openmrs/ws/rest/v1/labInstrument/72a26526-21d2-11e1-9815-00265e639063
</uri>
</org.openmrs.module.webservices.rest.web.Hyperlink>

It should be //localhost:8080/openmrs-webapp/rest/v1/jsslab/labInstrument/72a26526-21d2-11e1-9815-00265e639063
This might be fixable in the same way the test page was fixed to give the actual url.