Javadoc/misc updates from backports; from old-1.1.xx/bb9d216, 22f0f2b, 15b785b