Merge "restore missing fluentd client functionality"