Merge "For global-onap-configmap use file content"
authorAlexis de Talhouët <alexis.de_talhouet@bell.ca>
Thu, 14 Sep 2017 19:07:53 +0000 (19:07 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 14 Sep 2017 19:07:53 +0000 (19:07 +0000)

Trivial merge