more jboss amq related changes