1.6.4 build issue was fixed.
OFetchHelper: maintain support for fieldValue of type OMultiCollectionIterator (via Iterable interface)
Merge branch 'develop' of github.com:orientechnologies/orientdb into develop
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
Minor: fixed unmarshalling of rid when the value is not a rid
Merge branch 'develop' of https://github.com/orientechnologies/orientdb into develop
Minor: improved exception when JSON is not valid
Distributed: fixed bug on db aligning after deploy database
Fixed issue #2068
Distributed: fixed problem on replication. Now reqId is unique in whole cluster and during backup last operation is returned to avoid loosing msg
Fixed compilation problems
Distributed: made hazel cast configurable by using dynamic API
Minor: added more logs
Distributed: fixed CCE on tx fix
Distributed: fixed NPE on deploydb
Fixed a printf problem