Merge proposals dependent on lp:~rodsmith/checkbox/network-fixes

lp:~rodsmith/checkbox/network-fixes has no merge proposals.