fix(nifi): Backport NIFI-16431 into 2.12.0 and 2.9.0

[sbernauer]

Description

As requested in SUP-429, backport apache/nifi#11763.
NiFi 2.12.0 had no conflicts, 2.9.0 only one conflicct, so I backported into them.
NiFi 2.6.0 caused more conflicts, so I skipped that for now, we can do that if needed.

Definition of Done Checklist

Note

Not all of these items are applicable to all PRs, the author should update this template to only leave the boxes in that are relevant.

Please make sure all these things are done and tick the boxes

• Changes are OpenShift compatible
• All added packages (via microdnf or otherwise) have a comment on why they are added
• Things not downloaded from Red Hat repositories should be mirrored in the Stackable repository and downloaded from there
• All packages should have (if available) signatures/hashes verified
• Add an entry to the CHANGELOG.md file
• Integration tests ran successfully

TIP: Running integration tests with a new product image

The image can be built and uploaded to the kind cluster with the following commands:

boil build <IMAGE> --image-version <RELEASE_VERSION> --strip-architecture --load
kind load docker-image <MANIFEST_URI> --name=<name-of-your-test-cluster>

See the output of boil to retrieve the image manifest URI for <MANIFEST_URI>.

[NickLarsenNZ]

LGTM.

Just curious why an existing patch was touched.

[NickLarsenNZ]

LGTM, except whatever patchable did