Merge origin/release-2020 into master

Resolved Conflicts:
	src/gromacs/mdlib/update.cpp
	src/gromacs/mdrun/md.cpp

Change-Id: Ibf1c632cc3096121dccd6c1c1af9bff3d590d18f

diff --cc src/gromacs/mdlib/leapfrog_cuda.cu
Simple merge

diff --cc src/gromacs/mdlib/leapfrog_cuda.cuh
Simple merge

diff --cc src/gromacs/mdlib/lincs_cuda.cu
Simple merge

diff --cc src/gromacs/mdlib/sim_util.cpp
Simple merge

diff --cc src/gromacs/mdlib/update_constrain_cuda_impl.cu
Simple merge

diff --cc src/gromacs/mdrun/runner.cpp
Simple merge

diff --cc src/gromacs/mdtypes/state_propagator_data_gpu_impl_gpu.cpp
Simple merge