Fix for buildout 2.2.3 upgrade/downgrade problems

Fix for #198 

I'm going home; TODO: changelog entry. Functionality works.

Note: I'm getting one test error (number of log handlers, unrelated).
Shouldn't this be ``if req.key not in ...``, and skip setting ``dist``, since that's already ``None``?