1.6.4 build issue was fixed.
Merge branch '1.7-RC1'

Conflicts:

server/src/main/java/com/orientechnologies/orient/server/schedule/OSched
uleHandler.java
Make blueprints-test a test scope dependency

Test dependencies like blueprints-test should be in test scope.
Merge pull request #2069 from sslavic/patch-1

Make blueprints-test a test scope dependency
Declare orientdb-core dependency to be of jar type

orientdb-core pom dependency is of no use here, it's not even a BOM pom. It is not only not-useful, but it is casusing issues. E.g. with SBT, even if I explicitly added orientdb-core dependency, the pom type of orientdb-core dependency in orientdb-graph pom was removing orientdb-core from the classpath, so in my code any class referencing a class which makes use of orientdb-core classes would not compile (was getting infamous "class file is broken error").

Thus, instead of pom type, orientdb-core dependency should be declared as dependency of jar type (default).
Merge pull request #2070 from sslavic/patch-2

Declare orientdb-core dependency to be of jar type
Merge branch 'develop'
Update README.md
Merge pull request #2171 from glenselle/patch-1

Update README.md
Context variable available in UPDATE SET syntax.Since now UPDATE X SET Link=$var is possible
Update README.md
Fix possible NPE
Merge remote-tracking branch 'origin/develop' into develop
Issue #2276. OChainedIndexProxy: Improve non composite index usage.
Issue #2276. OChainedIndexProxy: Allow to use non composite hash index.
Issue #2276. SQL Select. Search for indexes. remove code duplication.
Minor: refactoring
Minor: refactoring
Issue #2276. SQL Select. Refactoring of: Index existence
Issue #2276. SQL Select. Search for indexes. remove code duplication.