Ready for review.  Needed to also extract ISC_LIKELY and ISC_UNLIKELY.

<isc/util.h> is no longer included in any header file with the exception of
<isccc/uti.h> which serves a similar purpose.