Merge "Add bubblewrap to bindep / test-setup.sh" into feature/zuulv3