Merge proposals dependent on lp://staging/~desrt/groundcontrol/bugfix-lp-581093

lp://staging/~desrt/groundcontrol/bugfix-lp-581093 has no merge proposals.