LUCENE-5205: latest patch, synced to trunk, whitespace and braces and javadocs fixes only

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