bug  fix: compiling error
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	arangod/RestHandler/RestPleaseUpgradeHandler.cpp