Fix additional typos form manual merge
Fix additional typos from manual merge
Merge branch 'insteon_timeout_factor' into running
Merge branch 'insteon_min_max_hops' into running