Merge "Bug fixes October 16"
authorRob Daugherty <rd472p@att.com>
Thu, 18 Oct 2018 12:43:33 +0000 (12:43 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 18 Oct 2018 12:43:33 +0000 (12:43 +0000)

Trivial merge