Merge "Make doclava compatible with both JDK 8 and 11."