Some tests use more ports than just the query and control ports. Each test that can run in parallel with other tests is now assigned a unique block of 10 ports. (cherry picked from commite0ff77f9d3) (cherry picked from commitdf1348ad2b) (cherry picked from commitc64af8abe5)