Merge branch 'aclocal-path' into maint * aclocal-path: tests: fix tests on aclocal search path precedences