java: single underscore variables highlighting for Java 8
revert: a87ea82a544a958 (fixes broken find usages)