EZP-20943: fixed double AND in query when using relation attribute
Merge pull request #650 from ezsystems/fix-EZP-20943-op_code-removal-regression

Fix EZP-20943: Regression caused by op_code removal