Lucene5205

First attempt at pull request for merge from trunk on Lucene5205.  Let's see how much gitiocy this displays...