Mergeback rel 8 4 1 (#7398)

* backport complete

* Be more resilient to unexpected resource version IDs in database (#7216)

* Handle mismatched versions

* Be more resilient to unexpected resource versions in DB

* Test fix

* Test fix

* Work on tests

* Test fixes

* Test fixes

* Add changelog

* Spotless

* Address review comments

* HAPI bump

* Fix API breakages

* api breakages

* version set

* changelog and versioning

---------

Co-authored-by: James Agnew <[email protected]>
Co-authored-by: Gary Graham <[email protected]>
Co-authored-by: jdar <[email protected]>

Author: 4 people

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_4_1/upgrade.md

@@ -0,0 +1,3 @@
+---
+release-date: "2025-11-19"
+codename: "Amplification"

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_4_1/version.yaml

@@ -1,6 +1,7 @@
 ---
 type: add
 issue: 7216
+backport: 8.4.1
 title: "The `$reindex` operation now supports an additional operation called `correctCurrentVersion`. This type of reindexing
    searches for resources that have a current version pointer to a version that no longer exists (typically because the
    database has been manually modified)."

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_6_0/7216-add-correct-current-version-to-reindex.yaml

@@ -1,6 +1,7 @@
 ---
 type: add
 issue: 7216
+backport: 8.4.1
 title: "The JPA server will now fail if the ID-assignment sequence returns a value of -1. This should not be possible
    under normal operation, but could happen if someone manually modifies the sequence, and causes very unpredictable
    behaviour."