Updated to reflect jdk 1.8 for example.
Authored by: keess 2017-06-14
Parent: [r3026]
Child: [r3028]