Merge proposals dependent on lp://qastaging/~glen666/griffith/bug-913299

lp://qastaging/~glen666/griffith/bug-913299 has no merge proposals.