merged https://github.com/pantsbuild/pants/pull/6413 -- @witty-crayon-22786 should i cherry-pick this on the 1.8.x branch too or should someone else do that (whoever did the 1.8.x release)? otherwise i'll cherry-pick it onto 1.9.x and make the notes changes PR