Merge release-5-0 into master

Conflicts:
	share/top/gurgle.dat

Change-Id: I95bb9d2ce43ed7fdfe6cfd535e4f88fac9dfb5ea

diff --cc CMakeLists.txt
Simple merge

diff --cc share/top/gurgle.dat
index 9e997a1d981a0c7b31023b646d9294f02bc69b53,22cea815631341dcefab9df2ef5f573b586e1b8a..1f5aa7406cc69585932c03509af142ebdb197df1
--- 1/share/top/gurgle.dat
--- 2/share/top/gurgle.dat
+++ b/share/top/gurgle.dat
@@@ -1,4 -1,4 +1,4 @@@
- 399
 -401
++402
  If You Want Something Done You Have to Do It Yourself_(Highlander II)
  I Live the Life They Wish They Did_(Tricky)
  Jesus Built My Hotrod_(Ministry)
@@@ -397,4 -397,6 +397,7 @@@ Restraint! What possible restraint?_(Jo
  It was something to at least have a choice of nightmares_(Joseph Conrad)
  You fight, work, sweat, nearly kill yourself, sometimes you do kill yourself, trying to accomplish something - and you can't._(Joseph Conrad)
  And after some more talk we agreed that the wisdom of rats had been grossly overrated, being in fact no greater than that of men_(Joseph Conrad)
 +It's an easy game, just don't let the ball past!_(Szilard Pall)
+ The soul? There's nothing but chemistry here_(Breaking Bad)
+ You got one part of that wrong. This is not meth._(Breaking Bad)
+ It's easy to remember: a half a kT is equal to five fourths of a kJ/mol._(Anders Gabrielsson)

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

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

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

diff --cc src/gromacs/tools/dump.c
Simple merge