Merge proposals dependent on lp://qastaging/~macslow/notify-osd/fix.810325

lp://qastaging/~macslow/notify-osd/fix.810325 has no merge proposals.