LUCENE-2324: Committing second version of the patch to the real-time branch. It's not done yet, but easier to track progress using the branch.