Major packaging change to allow composition of hdn-data and hdn-services servers