ISPN-5036

https://issues.jboss.org/browse/ISPN-5036

Remote uber-jar CDI test fails due to https://issues.jboss.org/browse/ISPN-5092
Surpasses PR #3152, the commit in PR #3152 is included in this PR.