Merge branch 'maint' into python-work

* 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
  tests: simplify wrapper for aclocal
  fix: minor typo in ChangeLog
  coverage: vala support failing for VPATH from-scratch builds
  docs: report few more automake parsing limitations
  tests: list "forgotten" test script in TESTS
  ylwrap: fix unusual indentation whitespace

diff --cc ChangeLog
Simple merge

diff --cc NEWS
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge