Merge branch 'origin/release-2020' into master

Merge branch 'origin/release-2020' into master

Resolved Conflicts:
	admin/clang-tidy.sh
	admin/containers/buildall.sh
	admin/containers/utility.py
	admin/dockerfiles/buildall.sh
	admin/dockerfiles/ci-clang/Dockerfile
	admin/dockerfiles/ci-docs-clang/Dockerfile
	admin/dockerfiles/ci-docs-gcc/Dockerfile
	admin/dockerfiles/ci-gcc/Dockerfile
	admin/gitlab-ci/archive.gitlab-ci.yml
	admin/gitlab-ci/documentation.gitlab-ci.yml
	admin/gitlab-ci/global.gitlab-ci.yml
	admin/gitlab-ci/gromacs.gitlab-ci.yml
	admin/gitlab-ci/lint.gitlab-ci.yml
	cmake/gmxManageSimd.cmake
	cmake/gmxVersionInfo.cmake
	docs/dev-manual/containers.rst
	src/CMakeLists.txt
	src/api/cpp/tests/testingconfiguration.h
	src/buildinfo.h.cmakein
	src/gromacs/CMakeLists.txt
	src/gromacs/ewald/pme_only.cpp
	src/gromacs/fileio/matio.cpp
	src/gromacs/fileio/oenv.cpp
	src/gromacs/gmxana/gmx_do_dssp.cpp
	src/gromacs/gmxana/nrama.cpp
	src/gromacs/gmxlib/network.cpp
	src/gromacs/gmxlib/nonbonded/nb_free_energy.cpp
	src/gromacs/listed_forces/bonded.cpp
	src/gromacs/mdlib/forcerec.cpp
	src/gromacs/mdtypes/interaction_const.h
	src/gromacs/nbnxm/pairlist.h
	src/gromacs/selection/CMakeLists.txt
	src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_simd_double.h
	src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256_simd_float.h
	src/gromacs/simd/simd.h
	src/gromacs/utility/basedefinitions.h
	src/gromacs/utility/binaryinformation.cpp
	src/testutils/CMakeLists.txt
	src/testutils/TestMacros.cmake
	src/testutils/testasserts.h

Change-Id: Ie157786299ca8f2d8c77a148b3bf1b1061f44b8a