Merge pull request #9514 from jflyper/bfdev-h7-clock-code-cleanup