CMS-3509 Refactoring for better osgi migration. Removed guice-servlet dependency.