Merge "Re-enable containerized fluentd" into stable/pike