Merged HelixAdministratorClient and HelixClient into a single class