[HELIX-7] fix intermitent test failures
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix