Merge proposals dependent on lp://staging/~cbehrens/agent-smith/bug621208

lp://staging/~cbehrens/agent-smith/bug621208 has no merge proposals.