Merge proposals dependent on lp://qastaging/~network-manager/network-manager/network-manager-openvpn.maverick

1. network-manager-openvpn.maverick
2. Dependent merge proposals