allow per-field overrides of facet params (f.facetName.facet.param in SOLR)
allow per-field overrides of facet params (f.facetName.facet.param in SOLR)
Merge branch 'upstream'