backport docs fixes

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_5x@1642260 13f79535-47bb-0310-9956-ffa450edef68
fix lint problems at private level (not enforced, jflex has some issues with generated code)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_5x@1642262 13f79535-47bb-0310-9956-ffa450edef68