Merge branch release-2016 into release-2018

Change-Id: I22d5b28794a4bbb3b122af339a282695aa64f266

diff --cc src/gromacs/domdec/domdec.cpp
Simple merge

diff --cc src/gromacs/domdec/domdec_box.cpp
index 43baf199539e7789273009b15f02049f95f13b79,62fc9e2cb2e58b2bb6a8e02305ff95509b5558b0..257ceaec646b65933b2dbdd149f5dd72197d1f7b
--- 1/src/gromacs/domdec/domdec_box.cpp
--- 2/src/gromacs/domdec/domdec_box.cpp
+++ b/src/gromacs/domdec/domdec_box.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2009,2010,2014,2015,2017, by the GROMACS development team, led by
 - * Copyright (c) 2009,2010,2014,2015,2018, by the GROMACS development team, led by
++ * Copyright (c) 2009,2010,2014,2015,2017,2018, 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.