[infinispan-dev] Merge commits in Git