Merge "Merge branch 'release-2019' into master"

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

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

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