merged-in refactoring and fix for collectd_settings to handle string values