Merge proposals dependent on lp://qastaging/~ci-train-bot/notify-osd/notify-osd-ubuntu-focal-3850

1. notify-osd-ubuntu-focal-3850
2. Dependent merge proposals