Fixes pool_restart tests
Fixes broken merge
celery.conf.add_defaults now supports adding non-Mapping objects
MongoDB: MONGODB_BACKEND_SETTINGS now accepts "options" for kwargs to pass to pymongo.Connection.  Closes #1015