Via an intermediate make file, tests that have been modified to be able to run in parallel are assigned unique query and control port numbers (other than 5300 and 9953 respectively). Tests that have not yet been modified all use ports 5300 and 9953, so must be run sequentially. (cherry picked from commite7429b124b) (cherry picked from commit4f68e67e5c) (cherry picked from commit704e2324e3)