**cherry-pick to 3.0.x, 2.4.x**
(cherry picked from commit 09c612c4ba)
# Conflicts:
# spring-amqp/src/main/java/org/springframework/amqp/utils/SerializationUtils.java
**cherry-pick to 3.0.x, 2.4.x**
(cherry picked from commit 09c612c4ba)
# Conflicts:
# spring-amqp/src/main/java/org/springframework/amqp/utils/SerializationUtils.java