Merge "Fix sonar issues + merge"
authorWilliam Reehil <william.reehil@att.com>
Thu, 29 Jul 2021 14:56:37 +0000 (14:56 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 29 Jul 2021 14:56:37 +0000 (14:56 +0000)

Trivial merge