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

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