Merge "stability fixes"
authorRob Daugherty <rd472p@att.com>
Mon, 10 Sep 2018 12:43:13 +0000 (12:43 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 10 Sep 2018 12:43:13 +0000 (12:43 +0000)

Trivial merge