Merge branch 'release-2020' into master

Merge branch 'release-2020' into master

Resolved Conflicts:
	CMakeLists.txt
	admin/ci-scripts/build-and-test-py-gmxapi-0.1.sh
	admin/ci-scripts/build-and-test-sample_restraint-2020.sh
	admin/clang-tidy.sh
	admin/gitlab-ci/global.gitlab-ci.yml
	admin/gitlab-ci/gromacs.gitlab-ci.yml
	admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
	cmake/gmxManageGPU.cmake
	cmake/gmxManageNvccConfig.cmake
	cmake/gmxVersionInfo.cmake
	share/CMakeLists.txt
	src/config.h.cmakein
	src/gromacs/CMakeLists.txt
	src/gromacs/analysisdata/CMakeLists.txt
	src/gromacs/ewald/pme.cpp
	src/gromacs/fileio/tpxio.cpp
	src/gromacs/fileio/writeps.cpp
	src/gromacs/gmxana/gmx_hbond.cpp
	src/gromacs/gmxana/gmx_lie.cpp
	src/gromacs/gmxana/gmx_xpm2ps.cpp
	src/gromacs/gmxpreprocess/genrestr.cpp
	src/gromacs/gmxpreprocess/tests/CMakeLists.txt
	src/gromacs/gpu_utils/gpu_utils.cu
	src/gromacs/gpu_utils/tests/pinnedmemorychecker.cpp
	src/gromacs/math/CMakeLists.txt
	src/gromacs/options/CMakeLists.txt
	src/gromacs/pbcutil/CMakeLists.txt
	src/gromacs/topology/mtop_util.cpp
	src/gromacs/trajectoryanalysis/CMakeLists.txt
	src/gromacs/utility/CMakeLists.txt

Change-Id: I9c364fc3a8e1d9ba9821e06155136ffc6f46b8cd