[HELIX-209] Fix Rebalancer and model package conflicts