hdhomerun plugin code cleanup (part 2)

Change-Id: I9d006091c50830603786c3d5d5d9139c5aeaddac
15 files changed