Merge proposals dependent on lp:~ballogy/notify-osd/make-tests-optional

lp:~ballogy/notify-osd/make-tests-optional has no merge proposals.