Fix NPE on delayed.
Merge branch 'cloudtm_v1' of https://github.com/nmldiegues/infinispan into cloudtm_v1