LUCENE-5611: put current patch on branch

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