Merge "Merge release-5-0 into master"

diff --cc src/gromacs/CMakeLists.txt
Simple merge

diff --cc src/gromacs/mdlib/domdec.c
Simple merge

diff --cc src/gromacs/mdlib/minimize.c
Simple merge

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

diff --cc src/programs/mdrun/md.cpp
Simple merge