XWIKI-10080: FAQ Search no longer searches in the FAQ space only when using the SOLR search
* More simplification.
* Change Main.SolrSearchConfig to merge the provided configuration with the default one.