Update to OSGi 4.3 with use of generics for service registry.

Maintains binary compatibility with pre-4.3 versions.