network modifications required for windows
merge conflicts with devel
more merge conflicts fixes
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel