CI: improve stability

-- Added apt-get update before any apt-get command in shell script on VM
     Necessary if the cloud image is a bit out of sync
  -- Added VM memory parameter when creating VM
     Necessary for cppcheck build
  -- Aligned some scripts with develop branch

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

ci-scripts/doGitLabMerge.sh

@@ -104,6 +104,10 @@ git checkout -f $SOURCE_COMMIT_ID
 
 git merge --ff $TARGET_COMMIT_ID -m "Temporary merge for CI"
 
-exit 0
-
-
+STATUS=`git status | egrep -c "You have unmerged paths.|fix conflicts"`
+if [ $STATUS -ne 0 ]
+then
+    echo "There are merge conflicts.. Cannot perform further build tasks"
+    STATUS=-1
+fi
+exit $STATUS