[#1027] Fixes celery configuration to allow overriding from config
Removed trailing whitespace
Merge branch '1027-celery-configuration'