Merge "Merge 'origin/casablanca' into master"
authorMarcus Williams <marcus.williams@intel.com>
Mon, 28 Jan 2019 20:43:35 +0000 (20:43 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 28 Jan 2019 20:43:35 +0000 (20:43 +0000)

Trivial merge