Merge branch 'maint' into branch-1.11

Merge branch 'maint' into branch-1.11

* maint:
  fix: make a test script executable
  coverage: expose automake bug#9651
  parallel-tests: automake error our on invalid TEST_EXTENSIONS
  fix: regenerate Makefile
  fix: regenerate Makefile.in files
  maintcheck: fix usage of `cd' instead of `$(am__cd)'
  docs: don't suggest installing `.m4' files in hard-coded location
  distuninstallcheck: fail also when only one file is left installed
  uninstall: "make uninstall" before "make install" works
  tests: fix tests on aclocal search path precedences
  fix: typo in NEWS
  docs: document planned precedence changes in aclocal search path
  aclocal: handle ACLOCAL_PATH environment variable
  tests: fix spurious failure in 'primary-prefix-valid-couples.test'
  docs: deprecate JAVA primary
  docs: clearer distinction between `.java' with javac and with gcj
  java: complain if java_JAVA is used but $(javadir) is undefined