Merge "Update SettingUp Heat" into casablanca
authorRich Bennett <rb2745@att.com>
Tue, 27 Nov 2018 16:51:10 +0000 (16:51 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 27 Nov 2018 16:51:10 +0000 (16:51 +0000)

Trivial merge