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

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