Merge pull request #17689 from BKPepe/tvheadend-conffiles