TEMPORARY COMMIT, revert it when testing of EAP 6.3.0.ER9 without STSClientPool will be finished