Merge proposals dependent on lp://qastaging/~udienz/network-manager/network-manager-vpnc.head.daily

1. network-manager-vpnc.head.daily
2. Dependent merge proposals