Merge proposals dependent on lp://staging/~jkakar/storm/uuid-bug-fixes

lp://staging/~jkakar/storm/uuid-bug-fixes has no merge proposals.