QPID-6172 : Ensure the type attribute is always present in the actual attribute map

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1633361 13f79535-47bb-0310-9956-ffa450edef68