CMS-3561 Make admin module work in OSGi. Fixed resource servlets so that it's easier to map in OSGi.