Merge #11319: [qa] Fix error introduced into p2p-segwit.py, and prevent future simila...