ISPN 4313 & ISPN-4316 SSL authentication fixes

https://issues.jboss.org/browse/ISPN-4313
https://issues.jboss.org/browse/ISPN-4316