Merge branch 'maint' into branch-1.11

* maint:
  cosmetics: move CheckListOfTests.am into tests/
  tests: move all under the same hierarchy ('tests/' directory)
  gitlog-to-changelog: update from upstream
  changelog: don't cluster multiple entries under the same "date line"
  fixup: contrib: really integrate in automake build system
  contrib: new, a directory for non-mainstream functionalities

diff --cc configure.ac
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/list-of-tests.mk
Simple merge