Merge release-4-6 into master

Merge release-4-6 into master

Conflicts (change moved to src/gromacs/CMakeLists.txt):
        src/mdlib/CMakeLists.txt
        src/gmxlib/CMakeLists.txt

deleted:
        src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel400_sse2_double.c
        src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel400_sse2_double.h
        src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel410_sse2_double.c
        src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel410_sse2_double.h
        src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel430_sse2_double.c
        src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel430_sse2_double.h

trivial conflicts:
        CMakeLists.txt
	cmake/gmxGetCompilerVersion.cmake
	src/config.h.cmakein
	src/gmxlib/CMakeLists.txt
	src/gromacs/gmxlib/copyrite.c
	src/gromacs/legacyheaders/maths.h
	src/gromacs/legacyheaders/types/nb_verlet.h

All new nonbonded moved.

This commit reverts 792f6b0. Visibility will be added to 5.0 later (it will be
sifnificant different because 5.0 only has one library libgromacs)

Change-Id: Icec02c1cd8992626fbb4b38cdbea935947f9853d