Merge proposals dependent on lp://staging/~network-manager/network-manager/network-manager-pptp.head.daily

1. network-manager-pptp.head.daily
2. Dependent merge proposals