I got too distracted by the CH names, so I renamed them locally :) 
https://github.com/danberindei/infinispan/compare/dan_pr_wburns_ISPN-4068-iterator