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