Merge "Fix test_bubblewrap_leak" into feature/zuulv3