@salmon-summer-38098: i'm going to go ahead and cherry pick https://github.com/pantsbuild/pants/pull/6564 to the 1.10.x branch. when we have the full patchset for https://github.com/pantsbuild/pants/pull/6552, we'll want to get those in too

Sounds good, let me know if you need me to

also had to cherry pick https://github.com/pantsbuild/pants/pull/6568 to (hopefully) get 1.10.x green.