Persistence guid hotfixes [12680] (backport #2244)

[mergify]

This is an automatic backport of pull request #2244 done by Mergify.
Cherry-pick of 7280e1d has failed:

On branch mergify/bp/2.3.x/pr-2244
Your branch is up to date with 'origin/2.3.x'.

You are currently cherry-picking commit 7280e1de2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/builtin/discovery/participant/PDP.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	modified:   src/cpp/rtps/reader/RTPSReader.cpp
	modified:   src/cpp/rtps/reader/StatefulReader.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

[rsanchez15]

@Mergifyio backport 2.1.x

[mergify]

backport 2.1.x

✅ Backports have been created

• #2593 Persistence guid hotfixes [12680] (backport #2244) (backport #2301) has been created for branch 2.1.x