Merge "Fix Sonar Issues on policy-models-tosca"