Infinispan external master

Updated version of #675 , aka master version of #682
Already reviewed conceptually