Merge pull request #677 from collectd/revert-630-F-METRICS-383-tsdb-writer-5.4