[xmltv/el8] (14 commits) ...Pull in upstream patches to resolve grabber issues and remove local fixup