Locks are automatically relocked if dead lock happens.
Merge branch 'develop' of github.com:orientechnologies/orientdb into develop