QPID-7268 : Messages converted to AMQP 1.0 lose their body

merged from trunk using
svn merge -c 1744157   ^/qpid/java/trunk
conflicts resolved manually
4 files changed