Merge release-5-0 into master

Change-Id: Ib309c33a5923d50757122b789df9430aaa1ee98d

diff --cc src/gromacs/fileio/libxdrf.c
Simple merge

diff --cc src/gromacs/fileio/tngio.cpp
Simple merge

diff --cc src/gromacs/gmxana/geminate.c
Simple merge

diff --cc src/gromacs/gmxana/gmx_anaeig.c
Simple merge

diff --cc src/gromacs/gmxana/gmx_current.c
Simple merge

diff --cc src/gromacs/gmxana/gmx_mindist.c
Simple merge

diff --cc src/gromacs/gmxana/gmx_rms.c
Simple merge

diff --cc src/gromacs/gmxana/gmx_rmsdist.c
Simple merge

diff --cc src/gromacs/gmxana/gmx_xpm2ps.c
Simple merge

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

diff --cc src/gromacs/gmxlib/nonbonded/nb_free_energy.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc src/gromacs/utility/cstringutil.c
Simple merge