Merge "Fix simple sonar issues in models-tosca"