Merge pull request #7506 from shykes/cleanup-daemonconfig

Cleanup: refactor parsing and handling of Daemon config