Merge proposals dependent on lp://qastaging/~brad-marshall/charms/trusty/ceph-osd/nagios-fix-servicegroups

lp://qastaging/~brad-marshall/charms/trusty/ceph-osd/nagios-fix-servicegroups has no merge proposals.