Merge proposals dependent on lp://staging/~network-manager/network-manager/openvpn-ubuntu.0.7.1

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