HSEARCH-1365 Starting to rewrite ServiceManager