Cleanup (javadoc)
gradle: fix deadlock during build classpath resolve
 IDEA-133361 Deadlock
Merge remote-tracking branch 'origin/master'