IQSS/11133-search-fix

[qqmyers]

What this PR does / why we need it: Uses the form of the join query we need that works. (There was a reversion on #10706.) As noted in the issue, this only affects the case when the AVOID_EXPENSIVE_SOLR_JOIN is true and the user is in multiple groups and is not a superuser.

Which issue(s) this PR closes:

• Closes Search Service: an error condition under permission query optimization mode was introduced in 6.5 #11133

Special notes for your reviewer:

Suggestions on how to test this: Create a user in multiple groups that is not a super user, set dataverse.feature.avoid-expensive-solr-join to true, and verify that this user can see public data and their own datasets. Regression test that other users aren't affected.

[edit from @landreev:] Strictly speaking, this PR contains a small change in how search queries are formed when NOT in the "avoid solr join" mode as well; so, yet another regression test would be to also verify that searches are working properly without this optimization enabled. It is extremely unlikely that there are any such problems though.
demo.dataverse.org now has this solr optimization mode enabled, mirroring the production. This means that, going forward, any issue like this will get detected when the release candidate is deployed on demo as part of of the release process.

Does this PR introduce a user interface change? If mockups are available, please link/include them here:

Is there a release notes update needed for this change?:

Additional documentation:

[coveralls]

coverage: 22.694% (-0.001%) from 22.695%
when pulling 7c2e3be on GlobalDataverseCommunityConsortium:IQSS/11133-search-fix0with-multiple-groups
into 825ab15 on IQSS:develop.

[landreev]

Thank you for making a speedy PR!
Looks straightforward and appears to be working