[HELIX-364] Ensure participants and controllers sharing a session id are treated uniquely, rb=17256
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/helix