Merge "filebeat.yml changes"