Reduce the amount of objects being cached by ehcache

Conflicts:
	core-service/impl/src/main/resources/org/kuali/rice/coreservice/config/coreService.ehcache.xml