ISPN-4336 + ISPN-4337 as-integration-client fixes

https://issues.jboss.org/browse/ISPN-4336
https://issues.jboss.org/browse/ISPN-4337