Merge proposals dependent on lp://qastaging/~cyphermox/network-manager/fix-openvpn-upgrades-to-lucid

1. fix-openvpn-upgrades-to-lucid
2. Dependent merge proposals