Merge branch release-5-0 into release-5-1

Change-Id: I7795992dcc576dbe9b8cb42db0e95981c2a2e255

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

diff --cc src/gromacs/tools/compare.c
index 385aadce23c800c7a6d94ef4470ace87449c40b3,3b3947a6f19ff078bc375abfa3b10f4b7c16625b..5edc837bbc6c3f8ec7271e69380bf66b2ad5f344
--- 1/src/gromacs/tools/compare.c
--- 2/src/gromacs/tools/compare.c
+++ b/src/gromacs/tools/compare.c
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-  * Copyright (c) 2013,2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2013,2014,2016, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.