Merge proposals dependent on lp://qastaging/~network-manager/network-manager/pptp-ubuntu.0.7.1

1. pptp-ubuntu.0.7.1
2. Dependent merge proposals