Merge remote branch 'kev009/21_ac_use_system_extensions'

diff --cc buffer.c
Simple merge

diff --cc evbuffer-internal.h
Simple merge

diff --cc evport.c
Simple merge

diff --cc util-internal.h
Simple merge