Merge branch 'war' into ejb