Merge "Add server information for pptp vpn"