[xmltv/el7] Squashed commit of the following: