Merge "Fix Elasticsearch template issue" into release-1.1.0
authorAlexis de Talhouët <alexis.de_talhouet@bell.ca>
Mon, 4 Dec 2017 16:23:42 +0000 (16:23 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 4 Dec 2017 16:23:42 +0000 (16:23 +0000)

Trivial merge