Fix entity queries using the OR conjunction.

Andrei Mateescurequested to merge
issue/trash-3556388:3556388-entity-queries-using-or-conjunction into 3.x

Closes #3556388

Merge request reports