Some of our jobs have started failing with
error: Multiple top-level packages discovered in a flat-layout:
['roles', 'playbooks'].
... <and so on> ...
which seems to be a combination of jobs that don't run often and some
recent-ish version of setuptools/pip. From what I can tell, what we
want to do here is disable autodetection as what we have isn't really
a python distributable package.
Also fix the two places this is monkey-patched in over the existing
file.
Change-Id: I2a0dfbbedbb9bddd34b6af691118cf7c422a82b0
95d53aa40e