Fix incosistences between Pub/Sub history and RTPS history [12620] (backport #2239)

[mergify]

This is an automatic backport of pull request #2239 done by Mergify.
Cherry-pick of 6003592 has failed:

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

You are currently cherry-picking commit 6003592fd.
  (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:   include/fastdds/rtps/history/History.h
	modified:   include/fastdds/rtps/history/ReaderHistory.h
	modified:   include/fastrtps/subscriber/SubscriberHistory.h
	modified:   src/cpp/fastrtps_deprecated/subscriber/SubscriberHistory.cpp
	modified:   src/cpp/rtps/history/ReaderHistory.cpp
	modified:   src/cpp/rtps/reader/StatefulReader.cpp
	modified:   test/blackbox/common/BlackboxTests.hpp
	new file:   test/blackbox/types/KeyedData1mb.cpp
	new file:   test/blackbox/types/KeyedData1mb.h
	new file:   test/blackbox/types/KeyedData1mb.idl
	new file:   test/blackbox/types/KeyedData1mbType.cpp
	new file:   test/blackbox/types/KeyedData1mbType.h
	modified:   test/blackbox/utils/data_generators.cpp
	modified:   test/blackbox/utils/lambda_functions.cpp
	modified:   test/blackbox/utils/print_functions.cpp
	modified:   test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/CMakeLists.txt
	both modified:   test/blackbox/common/BlackboxTestsPubSubFragments.cpp

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/

[MiguelCompany]

@richiware Would you mind fixing the conflicts here?

[richiware]

@richiware Would you mind fixing the conflicts here?

@MiguelCompany Fixed conflict

[MiguelCompany]

LGTM

[MiguelCompany]

@richiprosima Please test this