Merge branch 'cpp-migration'

diff --cc src/gromacs/gmxlib/statistics/gmx_statistics.c
Simple merge

diff --cc src/gromacs/gmxlib/tpxio.c
Simple merge

diff --cc src/gromacs/gmxlib/txtdump.c
Simple merge

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

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

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

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

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