[HELIX-73] incorporating Vinayak's change on removing the host_port
naming constraint on instance names.
[HELIX-73] fix build failures
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix