Copy in marc4j extensions from solrmarc trunk

I may not have gotten everything.