integrate cfgperl changes into mainline

diff --cc perl.h
Simple merge
diff --cc pod/perldiag.pod
Simple merge
diff --cc util.c
Simple merge
		1	2
perl.h	patch \|	diff1 \|	diff2 \|	blob \| history
pod/perldiag.pod	patch \|	diff1 \|	diff2 \|	blob \| history
util.c	patch \|	diff1 \|	diff2 \|	blob \| history