Conform to the collectd config location
Merge branch 'configfile_location'