SONARJAVA-153 Fix handling of EOLs