Harmonized collector.wsgi with middleware.wsgi : if a config file in /etc/socorro exists, it is chosen first
Merge pull request #1100 from FishingCactus/collector_wsgi

Fixes Bug 845865: collector.wsgi chooses wrong ini pathname