Merge pull request #3488 from nrwahl2/nrwahl2-util_compat_drops
Drop almost all of both util_compat.h files