[HELIX-290] Prefer ideal state for 0.7.0 rebalancer if not user defined, rb=15381
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix
[HELIX-292] ZNRecordStreamingSerializer should not assume id comes first