Add two changes to 2.8.0rc6 prep (#13643)
Add two changes to 2.8.0rc6 prep (#13643)

[ci skip-rust]
benjyw/pants,pantsbuild/pants,pantsbuild/pants,pantsbuild/pants,benjyw/pants,benjyw/pants,pantsbuild/pants,pantsbuild/pants,pantsbuild/pants,benjyw/pants,pantsbuild/pants,benjyw/pants,benjyw/pants,benjyw/pants