Merge release-4-6 into master

Merge release-4-6 into master

Ontop of resolving conflicts:
- Removed any newly added GMX.*EXPORT
  (no visibility yet in master)
- Adapted gmxTestCXX11.cmake to the new approach of setting flags
  without caching
- Removed deleted g_dih from symlinking and legacymodules.cpp
- Fix gmx_cpuid.c (also part of I0ad9ca77b)

Changes not applied
- Template building (c22f43f2932c0, 332c939cfc44)
- Removed libmd renamed (3f231be160c46)

Conflicts:
	CMakeLists.txt (mostly easy - moved comment about
	    Windows and BUILD_SHARED_LIBS, and changes related to
            gmxTestCXX11)
	cmake/gmxCFlags.cmake
	include/nbsearch.h (only Export ignored)
	include/trajana.h (only Export ignored)
	share/template/CMakeLists.txt (changes not applied)
	src/gmxlib/CMakeLists.txt (changes not applied)
	src/gmxlib/cuda_tools/copyrite_gpu.cu (moved to src/gromacs)
	src/gmxlib/gpu_utils/CMakeLists.txt (only exports - ignored)
	src/gromacs/legacyheaders/edsam.h
	src/gromacs/legacyheaders/gmx_ana.h
	src/gromacs/legacyheaders/gmx_cpuid.h
	src/gromacs/libgromacs.pc.cmakein
	src/gromacs/mdlib/edsam.c
	src/gromacs/mdlib/forcerec.c
	src/gromacs/selection/compiler.cpp
	src/kernel/CMakeLists.txt
	src/mdlib/CMakeLists.txt (ignored Export&rename)
	src/mdlib/libmd.pc.cmakein (only rename - ignored)
	src/mdlib/nbnxn_cuda/CMakeLists.txt (only Export ignored)
	src/tools/CMakeLists.txt
	src/tools/gmx_dih.c
	src/tools/gmx_sans.c

Change-Id: I28541d3c871feb7261c685793b36045e1806014d