0039886: Refactoring: BroadWorks Entity Utility Split - apply further updates from LokiServer.FD_BroadWorksEntityUtilitySplit