SONARJAVA-221 Improve the line at which issues are reported and fix some false negatives