Merge branch 'maint' into branch-1.11

* maint:
  tests: fix spurious failure on fast machines
  aclocal: better URL reference in error message
  coverage: distcheck-hook to catch missing/outdated *.m4 files
  aclocal: more granularity in acdir overriding
  * tests/amhello-binpkg.test: Add missing $EXEEXT usage.
  fix: list test 'vala-vpath.test' in XFAIL_TESTS

diff --cc ChangeLog
Simple merge

diff --cc NEWS
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc m4/Makefile.in
Simple merge

diff --cc tests/Makefile.in
Simple merge