CMS-3559 Cleanup JaxRs code for OSGi.