Merge "Code Improvements-Vnfsdk-refrepo sonar issue fixes"