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.

(cherry picked from commit 02e735b996d02193e42814fe1411443960879d45)