Plink 316 sts client pool - latest changes from prod branch

https://issues.jboss.org/browse/PLINK-316