[xmltv/el8] Pull in selected patches from upstream from v1.2.1 to commit 882453f420