Merge "Casablana bugfixes"
authorRob Daugherty <rd472p@att.com>
Mon, 13 Aug 2018 11:58:37 +0000 (11:58 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 13 Aug 2018 11:58:37 +0000 (11:58 +0000)

Trivial merge