JDF-55 More Sonar ruleset compliance changes