The latest fixies from EAP 6.3 branch

STS Client pool changes