Fix for deadlock during reindex
More deadlock protection during reindex
Added extra logging to resetSearchResults
Improved resetSearchResults: do nothing when no rows found
Merge branch 'devel'
Bump version to 1.6.8-beta