[jboss-jira] [JBoss JIRA] Resolved: (AS7-833) Incorporate changes to AS7-701