Merge "Fix Elasticsearch template issue" into release-1.1.0