Debian initscripts: Preserve $CELERYD_OPTS from /etc/defaults/

contrib/debian/init.d/celerybeat

@@ -42,7 +42,7 @@ export DJANGO_PROJECT_DIR
 if [ -z "$CELERYBEAT" ]; then
     if [ ! -z "$DJANGO_PROJECT_DIR" ]; then
         CELERYBEAT="$DJANGO_PROJECT_DIR/manage.py"
-        CELERYBEAT_OPTS="celerybeat"
+        CELERYBEAT_OPTS="celerybeat $CELERYBEAT_OPTS"
     else
         CELERYBEAT=$DEFAULT_CELERYBEAT
     fi

contrib/debian/init.d/celeryd

@@ -36,7 +36,7 @@ export DJANGO_PROJECT_DIR
 if [ -z "$CELERYD" ]; then
     if [ ! -z "$DJANGO_PROJECT_DIR" ]; then
         CELERYD="$DJANGO_PROJECT_DIR/manage.py"
-        CELERYD_OPTS="celeryd"
+        CELERYD_OPTS="celeryd $CELERYD_OPTS"
     else
         CELERYD=$DEFAULT_CELERYD
     fi