Merge proposals dependent on lp://qastaging/~brad-marshall/charms/trusty/nova-compute/fix-nagios

lp://qastaging/~brad-marshall/charms/trusty/nova-compute/fix-nagios has no merge proposals.