Fix zookeeper datastore which does not keep tracked configuration callbacks
Try to fix some synchronisation issues
Minor fix for generics