Merge "Fix pillar condition for Elasticsearch"