More integration work from mainline_merge_shm #1647

Job	Run time
min features with gcc	1m 38s
code formatting check	38s
min features with g++	1m 39s
cppcheck	7m 55s
min features with clang	1m 30s
max features with gcc	2m 8s
max features with g++	2m 15s
max features with clang	2m 35s
max features with gcc and DEBUG	2m 12s
max features with gcc for 32-bit arch (legacy OS)	1m 31s
max features with g++ for 32-bit arch (legacy OS)	1m 53s
max features with clang for 32-bit arch (legacy OS)	1m 14s
	27m 8s

Provide feedback