Merge pull request #3336 from matt335672/fix_x11_socket_check #2253

Job	Run time
cppcheck	4m 2s
code formatting check	16s
min features with gcc	2m 9s
min features with g++	2m 17s
min features with clang	2m 17s
max features with gcc	3m 43s
max features with g++	2h 47m 51s
max features with clang	3m 30s
max features with clang and AddressSanitized	3m 20s
max features with gcc and DEBUG	2m 16s
max features with gcc for 32-bit arch (legacy OS)	1m 44s
max features with g++ for 32-bit arch (legacy OS)	1m 36s
max features with clang for 32-bit arch (legacy OS)	2m 27s
	3h 17m 28s

Provide feedback