Merge proposals dependent on lp://staging/~simpoir/storm/storm-packaging-retest

lp://staging/~simpoir/storm/storm-packaging-retest has no merge proposals.