fixed issues #2898 and #2893 about index usage with OR operator
Merge branch 'develop' of https://github.com/orientechnologies/orientdb into develop

Conflicts:
	core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLSelect.java