hide an object
removed a few over-eager asserts
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
removed --cluster.heartbeat-interval, moved value to ETCD