merge trunk (1097442:1097764)

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