Remove `nondist_release` for now.

This was causing issues with tito when run without the `--test` flag.
Merge remote-tracking branch 'origin/2.5-testing' into 2.5-dev
Merge remote-tracking branch 'origin/2.5-dev'