Merge "Remove redundant filebeat from portal-db" into release-1.1.0