LUCENE-5376: carry over last branch

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