CMS-2925 Remove PageComponent templates
Fixed portal test errors