Merge proposals dependent on lp://staging/~frankban/charms/trusty/redis/tsting-fixes

lp://staging/~frankban/charms/trusty/redis/tsting-fixes has no merge proposals.