fix failing tests
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix

Conflicts:
	helix-core/src/main/java/org/apache/helix/model/IdealState.java