Merge branch 'devel' of github.com:arangodb/arangodb into devel

Documentation/Books/Users/AqlOperations/Collect.mdpp

@@ -220,9 +220,10 @@ FOR u IN users
   }
 ```
 
-The `AGGREGATE` keyword can be used inside a `COLLECT` statement only. If used, it must 
-follow the declaration of grouping keys, or, if no grouping keys are used, it can follow 
-the `COLLECT` keyword directly:
+The `AGGREGATE` keyword can only be used after the `COLLECT` keyword. If used, it 
+must directly follow the declaration of the grouping keys. If no grouping keys 
+are used, it must follow the `COLLECT` keyword directly:
+
 
 ```
 FOR u IN users

arangod/VocBase/compactor.cpp

@@ -499,7 +499,7 @@ static bool Compactifier(TRI_df_marker_t const* marker, void* data,
     // let marker point to the new position
     found2->setDataPtr(result);
     // update fid in case it changes
-    if (!isWalDataMarker && found2->_fid != targetFid) {
+    if (found2->_fid != targetFid) {
       found2->_fid = targetFid;
     }
 
@@ -562,7 +562,7 @@ static bool Compactifier(TRI_df_marker_t const* marker, void* data,
         result, nullptr);  // ONLY IN COMPACTOR, PROTECTED by fake trx in caller
 
     if (res != TRI_ERROR_NO_ERROR) {
-      LOG_FATAL_AND_EXIT("cannot re-locate shape marker");
+      LOG_FATAL_AND_EXIT("cannot re-locate attribute marker");
     }
 
     context->_dfi._numberAttributes++;

js/server/modules/@arangodb/testing.js

@@ -901,15 +901,27 @@ function runThere (options, instanceInfo, file) {
     var o = makeAuthorizationHeaders(options);
     o.method = "POST";
     o.timeout = 3600;
+    if (typeof(options.valgrind) === 'string') {
+      c.timeout *= 2;
+    }
     o.returnBodyOnError = true;
     r = download(instanceInfo.url + "/_admin/execute?returnAsJSON=true",t,o);
     if (! r.error && r.code === 200) {
       r = JSON.parse(r.body);
     } else {
-      return {
-        status: false,
-        message: r.body
-      };
+      if (r.hasOwnProperty('body')) {
+        return {
+          status: false,
+          message: r.body
+        };
+      }
+      else {
+        return {
+          status: false,
+          message: yaml.safeDump(r)
+        };
+
+      }
     }
     return r;
   } catch (e) {