Merge "bubblewrap: adds --die-with-parent option" into feature/zuulv3