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

https://issues.jboss.org/browse/ISPN-4410
https://issues.jboss.org/browse/ISPN-4411
I guess we learn something every day :)

Still @tristantarrant, wouldn't it make sense to have a lower timeout for the tests?