Merge proposals dependent on lp://qastaging/~brad-marshall/charms/trusty/nagios/add-extra-config-options

lp://qastaging/~brad-marshall/charms/trusty/nagios/add-extra-config-options has no merge proposals.