Whole lotta merging going on...

[Erick Erickson]

Now that 4.2 has been cut, I want to merge in all the stuff around
SOLR-4196 so it can bake on the 4x code line for as long as possible. I
think the major instabilities are fixed up, object now or forever hold your
peace.

Erick