[jboss-jira] [JBoss JIRA] (JBEE-228) Incorporate latest changes from 1.5.0 Development Branch