CMS-4178 Use OSGi blueprint in wem-portal. Cleaned up some code.