[xmltv/el7] (2 commits) ...update to recent upstream patches