[xmltv/el8] (2 commits) ...Pull in upstream patches since 1.3.0