XWIKI-9221: Make possible in the XAR merge conflict question bean to answer that the same should be applied to similiar following situations
XWIKI-8689: Add Solr indexing daemon thread to handle the automatic indexing of documents as they are queued for indexing
Fix test