SCC-101: sonar fixes
Merge pull request #114 from mulesoft/SCC-101

SCC-101: sonar fixes