Merge release-4-6 into master

Merge release-4-6 into master

Conflicts:
	CMakeLists.txt (applied OpenMM changes to new location)
Deleted:
	src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel[0-9]*
	src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel_c_adress.c
	src/gromacs/gmxlib/nonbonded/nb_kernel_adress_c/nb_kernel_c_adress.h
Trivial:
	src/gromacs/legacyheaders/network.h
	src/gromacs/mdlib/adress.c
visibility.h not needed for master yet:
	src/gromacs/legacyheaders/types/ifunc.h
	src/gromacs/legacyheaders/types/iteratedconstraints.h
	src/gromacs/legacyheaders/types/nlistheuristics.h

This commit reverts e6cd064af2032c (Copyright). Will be done by Mark after 4.6
release using the script.

Change-Id: Id7371c4a727213159c1c481d300c5b5bd4e290b4