[METRICS-383] Review fixes for octo
Merge branch 'F-METRICS-383-tsdb-writer-5.4' into LLNW-collectd-5.4