BS-10213 : update to make it work on JbossAS7