Start building proper cleanup if instanciation throws in between.
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel