Merge proposals dependent on lp://staging/~brad-marshall/charms/trusty/swift-storage/add-nrpe-checks-fix-rsyncd-conf

lp://staging/~brad-marshall/charms/trusty/swift-storage/add-nrpe-checks-fix-rsyncd-conf has no merge proposals.