[HELIX-376] Remove HelixConnection/HelixManager duplicate code
merge master