fixed flags
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.1