Merge release-4-6 into master

Merge release-4-6 into master

Conflicts:
	CMakeLists.txt
	include/copyrite.h: applied to src/gromacs/gmxlib/copyrite.c
	share/template/CMakeLists.txt: reverted
	share/template/template.c: reverted
	src/config.h.cmakein
	src/gmxlib/gpu_utils/CMakeLists.txt: applied to src/gromacs/...
	src/gromacs/gmxpreprocess/readir.h
	src/gromacs/legacyheaders/types/nb_verlet.h

Removed:
	cmake/gmxCheckGCCVersion.cmake

	include/gmx_x86_simd_macros.h
	src/gromacs/legacyheaders/gmx_x86_simd_macros.h
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd128.c
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd256.c
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd_inner.h
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd_outer.h
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd_utils.h
	src/gromacs/mdlib/nbnxn_search_x86_simd.h
	src/mdlib/nbnxn_search_x86_simd.h

Moved:
	include/gmx_simd_macros.h
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn.c
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_2xnn.h
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn.c
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn.h
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn_includes.h
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn_inner.h
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn_outer.h
	src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils.h
	src/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd128.c
	src/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd256.c
	src/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd_inner.h
	src/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd_outer.h
	src/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd_utils.h
	src/mdlib/nbnxn_search_simd_4xn.h

Change-Id: I753f701d74b8d4533e74cede19712b030bf97ca6