issue #507, issue #508

Conflicts:
	Documentation/arango.template.in
merged PR