Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Installation/Linux/rc.arangod.Ubuntu

@@ -28,7 +28,11 @@ start () {
     chown arangodb $PIDDIR
 
     $DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor $@
-    log_end_msg $?
+    RETVAL=$?
+
+    log_end_msg $RETVAL
+
+    return $RETVAL
 }
 
 case "$1" in
@@ -36,25 +40,30 @@ case "$1" in
     log_daemon_msg "Starting $DESC" "$NAME"
 
     start
+    exit $?
     ;;
 
   stop)
     log_daemon_msg "Stopping $DESC" "$NAME"
 
     start-stop-daemon --stop --quiet --oknodo --exec $DAEMON --startas $DAEMON
-    log_end_msg $?
+    RETVAL=$?
+    log_end_msg $RETVAL
 
     test -f $PIDFILE && rm -f $PIDFILE
+    exit $RETVAL
     ;;
 
   restart)
     $0 stop
     sleep 3
     $0 start
+    exit $?
     ;;
 
   force-reload)
     $0 restart
+    exit $?
     ;;
 
   status)
@@ -65,6 +74,7 @@ case "$1" in
     log_daemon_msg "Upgrading $DESC" "$NAME"
 
     start --upgrade
+    exit $?
     ;;
 
   *)