merging https://github.com/pantsbuild/pants/pull/6425 now then continuing with the hotfix release process (cherry-picking it and fixing VERSION)