[HELIX-132] current-state and external-view are not cleaned up when a resource has been removed, rb=21666
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/helix