Add some more STS caching tests

Conflicts:
	services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
Recording .gitmergeinfo Changes
Fixing build