FACES-1818 also fixed FACES1427PortletTest