JDF-55 More Sonar ruleset fixes