Ogm 680

EhCache version. Mostly copy paste from Infinispan. Unfortunately there are a couple of differences that prevent a true copy paste or reference sharing. We should try and improve that at some point.