Merge branch release-4-6 into master

Merge branch release-4-6 into master

Nothing controversial. Rename detection failed on
gmx_detect_hardware.h, so that resolution is done by hand.

Conflicts:
	CMakeLists.txt
	admin/mkhtml
	src/gromacs/gmxlib/gmx_detect_hardware.c
	src/gromacs/mdlib/nbnxn_search.h
	src/programs/mdrun/runner.c

Conflict resolved in src/gromacs/legacyheaders/gmx_detect_hardware.h:
	include/gmx_detect_hardware.h

Conflicts to do with pkgconfig are mostly not applicable to master
branch (except for change to libgromacs.pc.cmakein to add
@GMX_LIBS_SUFFIX@). Others resolved by deleting the files or change
sets:
	src/gromacs/libgromacs.pc.cmakein
	src/CMakeLists.txt
	src/kernel/libgmxpreprocess.pc.cmakein
	src/mdlib/CMakeLists.txt
	src/mdlib/libmd.pc.cmakein
	src/tools/libgmxana.pc.cmakein

Change-Id: I0c02d3a235b909e4d9ea628bb392ff9173bfc902