more order tweaks and removed rules

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