Merge pull request #6067 from AndrzejKurek/cid-session-resumption-2-28

[Backport 2.28] Fix DTLS 1.2 session resumption