CMS-3509 Refactoring for better osgi migration. Simplified how servlets are registered. Will do different in OSGi.