Explicitly list default for parallel execution of tests
Put the default for -p in the right place.
Merge pull request #3204 from karlht/issue3174

Explicitly list default for parallel execution of tests