Fixing ehcache config file
Recording .gitmergeinfo Changes