Hsearch 1594

Preview only: Infinispan code not compiling yet.