Merge proposals dependent on lp://staging/~niedbalski/charms/trusty/swift-storage/backport-fix-lp1510666

lp://staging/~niedbalski/charms/trusty/swift-storage/backport-fix-lp1510666 has no merge proposals.