Partial collection of "configuration" from conf.d - two checks from different files

[blumus]

When collecting configuration from /etc/sensu/config.json && /etc/sensu/conf.d only some of the data if not collected. In particular if you have "checks" in two files it will only include one of them. This is due to that load_settings in util.py does "non deep" dictionary merge data = dict(data.items() + load_config(cfg).items()) . Instead deep merge is needed.