Some minor modifications to the STSClient
Improved fix of [CXF-5571], enabled broken test
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf