Ispn 2797

 - https://issues.jboss.org/browse/ISPN-2797
 - https://issues.jboss.org/browse/ISPN-3583