Merge branch 'develop' into MAX-324

Conflicts:
	utils/skygw_utils.cc

utils/skygw_utils.cc

@@ -145,12 +145,16 @@ int atomic_add(
         int *variable,
         int value)
 {
+#ifdef __GNUC__
+        return (int) __sync_fetch_and_add (variable, value);
+#else
 	asm volatile(
 		"lock; xaddl %%eax, %2;"
 		:"=a" (value)
 		: "a" (value), "m" (*variable)
 		: "memory" );
 	return value;
+#endif
 }
 
 
@@ -2171,4 +2175,4 @@ strip_escape_chars (char* val)
       cur++;
     }
   return true;
-}
+}