Merge "Migrate JDiff to new Javadoc"