Minor: fixed unmarshalling of rid when the value is not a rid
Merge branch 'develop' of https://github.com/orientechnologies/orientdb into develop