Attempt to get clean test run by increasing parallelization from 1 to 3
Merge remote branch 'origin/apache-ref/4.0' into champlain