Issue Summary

If you have an entity property alias or custom field with the same name as a system field, and attempt to execute a JQL search using this ambiguous clause name, the system field's validation code kicks in and prevents you from searching over the custom field/entity property.

Internally, the JQL execution code attempts to OR the multiple clauses for ambiguous clause names, but the validation code is kicking in sooner and breaking this.

Steps to Reproduce

1. Install a connect add-on which defines an entity property alias or add a custom field named "project".
2. add a value for that entity property/custom field to an issue which is not the name or key of a project (eg: 'bleh').
3. Attempt to search for that value in JQL (project = bleh).

Expected Results

One single issue in search results

Actual Results

The value 'bleh' does not exist for the field 'Project'.

Workaround

Use the {{cf[$id]]] or un-aliased entity property form of the clause names.