[mythtv: 7/7] Merge branch 'el7'