added config for server state
Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding

Conflicts:
	etc/relative/arangod.conf