ISPN-4654 AND over range queries does not work (indexless query)

Reopened. Previous fix was reverted.
Take 2.

jira: https://issues.jboss.org/browse/ISPN-4654