BUG 5370 - changes required by java8

No match.