Fix various integration tests (in 0.6.x)

including fixing jboss6 integration