SONARJAVA-596 added new rules & updated old ones initially entered incorrectly