ISPN-4410 + ISPN-4411 Server configuration and testsuite fixes

https://issues.jboss.org/browse/ISPN-4410
https://issues.jboss.org/browse/ISPN-4411
Ups, missed that! @tristantarrant feel free to send an updated commit....