Merge "Add server information for pptp vpn" into qt-dev