changed interface for locking

Conflicts:
	arangod/VocBase/transaction.cpp