Fixes for bringing javadocs next to the manual in 1.9.x.