Merge proposals dependent on lp://staging/~tribaal/charms/trusty/swift-storage/backport-1496004-to-stable

lp://staging/~tribaal/charms/trusty/swift-storage/backport-1496004-to-stable has no merge proposals.