SOLR-1301: Merge in latest solr-map-reduce updates.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1547871 13f79535-47bb-0310-9956-ffa450edef68
SOLR-1301: Merge in latest morphlines module updates.

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