Blocker and critical sonar fix

Few Blocker and critical sonar fixes
to help proceed with code reorganization
and milestone requirement.

Change-Id: Id8c8570d538a40fa910f4cceeca9d04c7d244d2f
IssueId: VNFSDK-80
Signed-off-by: AvinashS <avinash.s@huawei.com>
6 files changed