Improvements for versionable

Most important change is not rolling back the transaction after a deadlock, we found out that this can have some unfortunate side effects. So it's better to simply accept a deadlock if it should occur.