update the config with preconfig as non-defaults so they will be pickled

CONTRIBUTORS.txt

@@ -199,6 +199,7 @@ Krzysztof Bujniewicz, 2015/10/21
 Sukrit Khera, 2015/10/26
 Dave Smith, 2015/10/27
 Dennis Brakhane, 2015/10/30
+<<<<<<< HEAD
 Chris Harris, 2015/11/27
 Valentyn Klindukh, 2016/01/15
 Wayne Chang, 2016/01/15
@@ -212,3 +213,4 @@ Joe Sanford, 2016/04/11
 Takeshi Kanemoto, 2016/04/22
 Arthur Vuillard, 2016/04/22
 Colin McIntosh, 2016/04/26
+Jeremy Zafran, 2016/05/17

celery/app/base.py

@@ -855,7 +855,6 @@ class Celery(object):
             self.on_configure()
         if self._config_source:
             self.loader.config_from_object(self._config_source)
-
         self.configured = True
         settings = detect_settings(
             self.prepare_config(self.loader.conf), self._preconf,

celery/tests/utils/test_platforms.py

@@ -773,7 +773,7 @@ class test_setgroups(Case):
     @skip.if_win32()
     @patch('celery.platforms._setgroups_hack')
     def test_setgroups(self, hack):
-        with @patch('os.sysconf') as sysconf:
+        with patch('os.sysconf') as sysconf:
             sysconf.return_value = 100
             setgroups(list(range(400)))
             hack.assert_called_with(list(range(100)))