Merge proposals dependent on lp://qastaging/~brendan-donegan/checkbox/bug877752_connect_wireless_vpn

1. bug877752_connect_wireless_vpn
2. Dependent merge proposals