Merge "Bug fixes for casablanca"
authorRob Daugherty <rd472p@att.com>
Wed, 17 Oct 2018 13:11:41 +0000 (13:11 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 17 Oct 2018 13:11:41 +0000 (13:11 +0000)

Trivial merge