Right, I have a branch ready doing it, but hit a problem in Byteman which makes us fail a test. Investigating that with Byteman.
Also, trying to get Infinispan to move to Java7 too as we need an updated Lucene Directory, which implies we need a release of Infinispan using Lucene 4.8, implying in turn Java7.. not such a low hanging fruit as I hoped