Updating configuration to work with Solr 4.6
Updating solr files
Adding collection name to file
Merge branch 'solr_46' into 1.1.x