Merge proposals dependent on lp://staging/~stylesen/lava-dispatcher/evolve-bundle-stream-1.6

1. evolve-bundle-stream-1.6
2. Dependent merge proposals