Merge proposals dependent on lp://qastaging/~brad-marshall/charms/trusty/folder-swift-sync/add-nagios-check

lp://qastaging/~brad-marshall/charms/trusty/folder-swift-sync/add-nagios-check has no merge proposals.