Merge pull request #8478 from jordan-woyak/dsu-client-cleanup ControllerInterface/DSUClient: Minor cleanup.
