Merge pull request #2731 from matt335672/update_sockdir_security #1586

Job	Run time
cppcheck	14m 8s
code formatting check	28s
min features with gcc	2m 4s
min features with g++	3m 26s
min features with clang	2m 46s
max features with gcc	3m 45s
max features with g++	2m 31s
max features with clang	3m 28s
max features with gcc and DEBUG	2m 54s
max features with gcc for 32-bit arch (legacy OS)	2m 2s
max features with g++ for 32-bit arch (legacy OS)	1m 48s
max features with clang for 32-bit arch (legacy OS)	2m 39s
	41m 59s

Provide feedback