merge pptp fix from r15970 to 8.09