Update solr4x branch to Solr 4.2.1