Incorporate latest jbossas fixes