Merge branch release-2016

Ignored fix to zlib management for GMX_EXTERNAL_TNG=on because that
was already a feature of the refactoring of TNG management in master
branch.

Change-Id: I8bc7ce196fb0d64685c6957b5055d73ff093d864

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

diff --cc src/gromacs/selection/compiler.cpp
Simple merge

diff --cc src/gromacs/selection/sm_simple.cpp
Simple merge

diff --cc src/gromacs/selection/tests/selectioncollection.cpp
Simple merge

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

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