Merge branch 'release-5-0'

Trivial conflict resolved in runner.cpp.

Change-Id: I5bf8d6672246938f498fff609a7b0943505d2afb

diff --cc src/gromacs/gmxlib/gmx_cpuid.c
Simple merge

diff --cc src/gromacs/gmxpreprocess/readir.c
Simple merge

diff --cc src/gromacs/legacyheaders/gmx_cpuid.h
Simple merge

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