Fix some formatting
Add config.merge function for merginc config values across sources
Use config.merge instead of config.option for scheduling, Fix #6201
Add a CLI example to config.merge
Merge pull request #6585 from basepi/schedulerfix

Fix scheduler configuration from Pillar, Fix #6201