Work on jboss refactoring
Merge pull request #1 from jvazquez-r7/work_3540

Work on jboss refactoring