[CXF-5802] Fix a condition introduced with the removeCache call where if two proxies are using the same cache, closing one (or having it GC'd) would cause the cache to become invalid.

Conflicts:
	rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
	systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java

Conflicts:
	systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
Fix PMD issue
Recording .gitmergeinfo Changes