More integration work from mainline_merge_shm #656

Job	Run time
cppcheck	8m 43s
code formatting check	16s
min features with gcc	2m 33s
min features with g++	2m 40s
min features with clang	1m 37s
max features with gcc	1m 57s
max features with g++	2m 36s
max features with clang	2m 7s
max features with gcc and DEBUG	1m 52s
max features with gcc for 32-bit arch (legacy OS)	2m 2s
max features with g++ for 32-bit arch (legacy OS)	1m 35s
max features with clang for 32-bit arch (legacy OS)	1m 12s
	29m 10s

Provide feedback