Merge proposals dependent on lp://staging/~spiv/loggerhead/diff-of-r1

lp://staging/~spiv/loggerhead/diff-of-r1 has no merge proposals.