Merge pull request #13139 from aaronjg/openfortivpn/ppp-netifd-fix