Merge "Use the timeout from the heat template instead of"
authorSteve Smokowski <ss835w@att.com>
Thu, 16 Jan 2020 17:57:09 +0000 (17:57 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 16 Jan 2020 17:57:09 +0000 (17:57 +0000)

Trivial merge