BS-10213: make jboss test suite pass on jbossas7 & postgres
merge