Merge "Fix errors and warnings"
authorAvi Gaffa <avi.gaffa@amdocs.com>
Thu, 9 Aug 2018 11:53:30 +0000 (11:53 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 9 Aug 2018 11:53:30 +0000 (11:53 +0000)

Trivial merge