[HELIX-321] Controller forgets that it's the leader, rb=15817
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix