fix zkclient subscribe paths leaking and helix-manager callback handler leaking
merge changes