Fix merging of date operations (backport for 2.x)

[davisagli]

Backport #189 for Plone 6.1

[mister-roboto]

@davisagli thanks for creating this Pull Request and helping to improve Plone!

TL;DR: Finish pushing changes, pass all other checks, then paste a comment:

@jenkins-plone-org please run jobs

To ensure that these changes do not break other parts of Plone, the Plone test suite matrix needs to pass, but it takes 30-60 min. Other CI checks are usually much faster and the Plone Jenkins resources are limited, so when done pushing changes and all other checks pass either start all Jenkins PR jobs yourself, or simply add the comment above in this PR to start all the jobs automatically.

Happy hacking!

[davisagli]

@jenkins-plone-org please run jobs

[mauritsvanrees]

LGTM, thanks.

Two of the four Jenkins jobs fail, both in robot tests. One is a connection error, the other looks unrelated. Both seem ignorable. I merge.