Add scaffolding exported form upstream
Add portlet assignment fixes from wad upstream