Issue #3096 was partially fixed.
Merge branch 'develop' of github.com:orientechnologies/orientdb into develop

Conflicts:
	core/src/main/java/com/orientechnologies/orient/core/db/OPartitionedDatabasePool.java