PDI-10801 - Fixing Java 7 Autocomplete