Merge pull request #6846 from jflyper/bfdev-revo-remove-stale-adc-channel-def