Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev