Merge "Update SettingUp Heat"
authorRich Bennett <rb2745@att.com>
Tue, 27 Nov 2018 14:42:55 +0000 (14:42 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 27 Nov 2018 14:42:55 +0000 (14:42 +0000)

Trivial merge