Merge "Fixed sonar issue in Cloudify comp"