Merging ece8414 into releases/v2.

Conductor for this PR is @angelapwen.

Contains the following pull requests:

• Introduce a rollback mechanism for Java buildless  #2129 (@henrymercer)
• Add common CLI configuration error categories #2130 (@angelapwen)
• Mergeback v3.24.1 refs/heads/releases/v3 into main #2132 (@dbartol)
• Remove some inadvertently checked in build files #2134 (@henrymercer)
• Avoid analyzing generated configuration file #2135 (@henrymercer)
• Add backticks around branch in update-release-branch PR template #2138 (@henrymercer)
• Teach rebuild Action how to resolve conflicts in lib #2140 (@henrymercer)
• Deprecate fine-grained parallelism feature-flag #2141 (@nickrolfe)
• Merge main into releases/v3 #2142 (@angelapwen)

Please do the following:

• Ensure the CHANGELOG displays the correct version and date.
• Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.
• Check that there are not any unexpected commits being merged into the releases/v2 branch.
• Ensure the docs team is aware of any documentation changes that need to be released.
• Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.
• Wait for the "Update dependencies" workflow to push a commit updating the dependencies.
• Mark the PR as ready for review to trigger the full set of PR checks.
• Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.