CMS-3561 Make admin module work in OSGi. Rest services is now singletons.
CMS-3561 Make admin module work in OSGi. Fixed resource servlets so that it's easier to map in OSGi.
CMS-3562 Make portal module work in OSGi. Using singleton jaxrs resources.
Merge branch 'master' into osgi