First set of protection assertions.
Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh

Conflicts:
	arangod/Utils/Transaction.h