Grizzly compatibility with Havana Qpid messages

A change had to be made in the Havana Qpid implementation that is
not entirely backwards compatible.  This change allows Grizzly to
receive messages in the new format.

Backport of change for bug 1175808

Change-Id: I8b6c5734b67cd33cdd5ef0659bdd77504317187d