Merge branch 'maint' into java-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