Merge branch 'release-4-6'

Merge branch 'release-4-6'

Conflicts:
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn.c
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn.h
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn_includes.h
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn_inner.h
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn_outer.h
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn.c
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn.h
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn_includes.h
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn_inner.h
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn_outer.h
	src/mdlib/CMakeLists.txt
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn.c
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn_inner.h
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn_outer.h
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn.c
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn_inner.h
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn_outer.h
	src/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.c
	src/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h
	src/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_outer.h
	src/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c
	src/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_inner.h
	src/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h
All resolved in favour of release-4-6, per I0da1faf351def

There was no merge conflict in
src/gromacs/gmxlib/nonbonded/nb_free_energy.c, but Ic7ba3cc26be and
Ia8202ee90 had duplicated the same clean-up of doubly assigned
variables (e.g. Vc), but in different ways. The version in Ia8202ee90
has been retained.

Change-Id: Ia0ec22b7fc16b2be6817b007e52c8b4832549360