Merge "Fix Sonar Issues models-tosca-simple"