[xmltv/f31] Pull in upstream patches to resolve grabber issues