Merge proposals dependent on lp:~ezrareeves/groundcontrol/nm-fail

lp:~ezrareeves/groundcontrol/nm-fail has no merge proposals.