Merge branch release-2018

Change-Id: I2524a854b75c0100ab821c4512339f3768ed4428

diff --cc docs/doxygen/gmxtree.py
Simple merge

diff --cc src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/make_nb_kernel_avx_128_fma_double.py
Simple merge

diff --cc src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/make_nb_kernel_avx_128_fma_single.py
Simple merge

diff --cc src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/make_nb_kernel_avx_256_double.py
Simple merge

diff --cc src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/make_nb_kernel_avx_256_single.py
Simple merge

diff --cc src/gromacs/gmxlib/nonbonded/nb_kernel_c/make_nb_kernel_c.py
Simple merge

diff --cc src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/make_nb_kernel_sparc64_hpc_ace_double.py
Simple merge

diff --cc src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/make_nb_kernel_sse2_double.py
Simple merge

diff --cc src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/make_nb_kernel_sse2_single.py
Simple merge

diff --cc src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/make_nb_kernel_sse4_1_double.py
Simple merge

diff --cc src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/make_nb_kernel_sse4_1_single.py
Simple merge

diff --cc src/gromacs/listed-forces/listed-forces.cpp
Simple merge