Commit from JBoss Tools
modified for testing