Merge "Modify yaml templates for dmaap"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Tue, 15 Aug 2017 14:55:15 +0000 (14:55 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 15 Aug 2017 14:55:15 +0000 (14:55 +0000)

Trivial merge