On 1.7.x branch: Merge revision r1920350 from trunk: #614

Job	Run time
Default	3m 29s
Static	3m 23s
Maintainer-mode	3m 26s
Named SHM - SysV, Maintainer-mode	3m 25s
Named SHM - Classic mmap, Maintainer-mode	3m 58s
Pool-debug	3m 30s
Pool-debug, maintainer-mode	3m 25s
Maintainer-mode, no IPv6	3m 37s
Maintainer-mode, -Werror	3m 26s
ASan	3m 46s
ASan, pool-debug	3m 29s
UBsan	3m 37s
	42m 31s

Provide feedback