Merge remote-tracking branch 'gerrit/release-4-6'

Merge remote-tracking branch 'gerrit/release-4-6'

Conflicts:
	src/gmxlib/CMakeLists.txt
	src/gromacs/selection/parser.cpp
	src/gromacs/selection/parser.h
	src/gromacs/selection/parser.y
	src/gromacs/selection/scanner_internal.cpp

Modified:
	src/gromacs/CMakeLists.txt
	src/gromacs/gmxlib/CMakeLists.txt

The modifications in src/gromacs/*/CMakeLists.txt copy the NASM
renaming changes originally in src/gmxlib/CMakeLists.txt.

None of the parser and scanner modifications are included (whole
file resolved in favor of master).

Change-Id: Ic05705bf6d35b460ab9b6ae6ea315848514eadc9