Ispn 4376

https://issues.jboss.org/browse/ISPN-4376
https://issues.jboss.org/browse/ISPN-4583

Sorry about test spacing, newlines got messed up before.