Merge branch 'maint' into java-work * maint: testsuite: avoid re-running few tests with 'parallel-tests' option testsuite: allow tests to avoid the use of 'parallel-tests' option tests/README: update obsoleted advice With extra edits to these files: - tests/java-compile-run-flat.test - tests/java-compile-run-nested.test - ChangeLog - tests/Makefile.in (autogenerated)