SOLR-5824: Merge up Solr MapReduce contrib code to latest external changes. Includes a few minor bug fixes.