more order tweaks and removed comment from amqp tag

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