LUCENE-5160: merge from trunk

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