Merge "Add AAI config changes"
authorAlexis de Talhouët <alexis.de_talhouet@bell.ca>
Fri, 22 Sep 2017 17:38:10 +0000 (17:38 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 22 Sep 2017 17:38:10 +0000 (17:38 +0000)

Trivial merge