Abort 2.5.0 release prep and prepare 2.5.0rc3 (pantsbuild#12079)

[ci skip-rust]

src/python/pants/notes/2.5.x.md

@@ -2,9 +2,13 @@
 
 See https://www.pantsbuild.org/v2.5/docs/release-notes-2-5 for an overview of the changes in this release series.
 
-## 2.5.0 (May 13, 2021)
+## 2.5.0rc3 (May 14, 2021)
 
-The first stable release of the `2.5.x` series, with no changes since the previous `rc`.
+### Bug fixes
+
+* Fix constraints resolves to pass additional args. (Cherry-pick of #12076) ([#12077](https://github.com/pantsbuild/pants/pull/12077))
+
+* Fix `skip_tool` fields not working with `./pants fmt` (Cherry-pick of #12073) ([#12074](https://github.com/pantsbuild/pants/pull/12074))
 
 ## 2.5.0rc2 (May 12, 2021)