MDL-29857 - portfolio: Fix E_STRICT errors