fixed jslint warnings
fixed jslint warnings
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel