EhCache upgrade
Recording .gitmergeinfo Changes