SONARJAVA-433 Fix remaining issues in Java SQALE mapping