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

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