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

Change-Id: I9a18ef9c27af8920c517e1774496a5fbf6728da5