Refinement of 560c99abb8b7db7f5d7ca72653126134c97b3ac1
Fix handling of --report-useless-tests, --strict-coverage, --disallow-test-output, and --enforce-time-limit options
Merge branch '4.0' into 4.1
Merge branch '4.1'