Merge "Fix filebeat for SO" into release-1.1.0