Merge "Fix wrong filebeat config in aai" into release-1.1.0