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

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