Bring branch up to date with trunk

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