WAL logfile collection
Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh

Conflicts:
	arangod/Wal/CollectorThread.cpp