CAS-1269: Upgrade to EhCache 2.6.5
Merge branch 'master' into CAS-1269
Merge pull request #213 from Unicon/CAS-1269

CAS-1269: Upgrade to EhCache 2.6.5