NXP-10566: follow MockFacesContext improvements