Merge branch 'maint' into branch-1.11

* maint:
  gnupload: moved to gnulib
  sync: gitlog-to-changelog from gnulib upstream
  test defs: backport optimized 'using_gmake' implementation
  tests: unify some tests on "make -n", reducing duplication
  vala: use "$(am__cd) $(srcdir)", not "cd $(srcdir)"
  dist: avoid $(distdir) removal failure on MSYS/MinGW
  tests: fix spurious failure of 'get-sysconf.test'
  coverage: expose automake bug#10470 (distcheck-related)

diff --cc NEWS
Simple merge

diff --cc automake.in
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/defs.in
Simple merge