Merge release-5-0 into master

Conflicts:
	share/top/gurgle.dat

Change-Id: Ide32a9bfed25cda8eeb7869f1c5a878225c85723

diff --cc share/top/gurgle.dat
index 1f5aa7406cc69585932c03509af142ebdb197df1,474b5d99de8b9eba32924a003ecdb17e08ba4803..0e955e3f96e004697ece39230741a9a36ff8266b
--- 1/share/top/gurgle.dat
--- 2/share/top/gurgle.dat
+++ b/share/top/gurgle.dat
@@@ -1,4 -1,4 +1,4 @@@
- 402
 -413
++414
  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)
@@@ -401,3 -400,16 +401,15 @@@ It's an easy game, just don't let the b
  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)
 -
+ Ubiquitin's just a rock_(Berk Hess)
+ ... an excellent man, almost worthy of such a wife ..._(Jane Eyre in Jane Eyre by Charlotte Bronte)
+ Humbug! Most things free-born will submit to anything for a salary_(Mr. Rochester in Jane Eyre by Charlotte Bronte)
+ Like other defaulters, I like to lay half the blame on ill-fortune and adverse circumstances_(Mr. Rochester in Jane Eyre by Charlotte Bronte)
+ Either you will be dashed to atoms on crag points, or lifted up and borne by some master-wave into a calmer current_(Charlotte Bronte)
+ I ought to warn you, I have no faith_(Jane Eyre in Jane Eyre by Charlotte Bronte)
+ ... yet the [economic] profession continued to churn out purely theoretical results without even knowing what facts needed to be explained._(Thomas Piketty)
+ Scientists think they are born with logic; God forbid they should study this discipline with a history of more than two and a half millennia._(Roald Hoffmann)
+ In the processing of models we must be especially cautious of the human weakness to think that models can be verified or validated. Especially one's own._(Roald Hoffmann)
+ ... and that dream of dreams, a computational model that predicts everything accurately._(Roald Hoffmann)
+ You see it through a charmed medium: you can not discern that the gilding is slime and the silk draperies cobwebs; that the marble is sordid slate, and the polished woods mere refuse chips and scale bark._(Mr. Rochester in Jane Eyre by Charlotte Bronte)
+ I know poetry is not dead, nor genius lost; nor has Mammon gained power over either, to bind or slay; they will both assert their existence, their presence, their liberty and strength again one day._(Jane Eyre in Jane Eyre by Charlotte Bronte)

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

diff --cc src/gromacs/legacyheaders/types/forcerec.h
Simple merge

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

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

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