Merge branch 'develop' into rid-set-sbtree

Conflicts:
	core/src/main/java/com/orientechnologies/orient/core/db/record/ridset/sbtree/OSBTreeCollectionManager.java