Merge branch 'aclocal-path' into maint * aclocal-path: docs: document planned precedence changes in aclocal search path aclocal: handle ACLOCAL_PATH environment variable