LUCENE-4677, LUCENE-4682, LUCENE-4678, LUCENE-3298: Merged /lucene/dev/trunk:r1432459,1432466,1432472,1432474,1432522,1432646,1433026,1433109

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