Merge "champ and gizmo hotfix"
authorMike Elliott <mike.elliott@amdocs.com>
Wed, 28 Mar 2018 18:45:50 +0000 (18:45 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 28 Mar 2018 18:45:50 +0000 (18:45 +0000)

Trivial merge