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