Oof did not think about that one… cherry-picking this should fix it all! https://github.com/pantsbuild/pants/pull/7064

thanks! also needed to grab https://github.com/pantsbuild/pants/pull/7418 in order to pick cleanly, but now away: https://travis-ci.org/pantsbuild/pants/builds/517329331