Merge #11538: qa: Fix race condition failures in replace-by-fee.py, sendheaders.py