[HELIX-320] Remove merge conflicts from comments in files
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix