Fixes Solr 4.0 compatibility issue with policy clauses
Fixed merge conflict