[FELIX-4370] Additional work to support the OSGi Repository Service. Improved the mapping between OBR and OSGi namespaces. This also fixes an OSGi Repository CT failure: RepositoryTest.testRepositoryContent()