Fix issues related to https://sonar.onap.org/project/issues?resolved=false&fileUuids=AWVec_HZxOv3LmQdCK3M&id=org.openecomp.sdc%3Asdc-main%3Amaster