Merge release-5-0 into master

Change-Id: I862e73932dea368b5bac883eb1bf5725314efd2d

diff --cc cmake/gmxCFlags.cmake
Simple merge

diff --cc cmake/legacy_and_external.supp
Simple merge

diff --cc src/gromacs/analysisdata/tests/analysisdata.cpp
Simple merge

diff --cc src/gromacs/analysisdata/tests/arraydata.cpp
Simple merge

diff --cc src/gromacs/analysisdata/tests/average.cpp
Simple merge

diff --cc src/gromacs/analysisdata/tests/datatest.h
Simple merge

diff --cc src/gromacs/analysisdata/tests/histogram.cpp
Simple merge

diff --cc src/gromacs/analysisdata/tests/lifetime.cpp
Simple merge