Issue #2664274 by alexpott, bojanz, fortis, Mile23, arknoll: Combination of...

Issue #2664274 by alexpott, bojanz, fortis, Mile23, arknoll: Combination of --prefer-dist and .gitattributes confuses our vendor test cleanup

(cherry picked from commit ffbaa3f2)
(cherry picked from commit 06a0758c)