[arquillian-issues] [JBoss JIRA] (ARQ-1788) containers - code refactoring