Issue #2150 was fixed.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	distributed/src/main/java/com/orientechnologies/orient/server/hazelcast/oldsharding/OAutoshardedStorageImpl.java