master: small javadoc change and import fix