XD-2381: Split MessageBus and Analytics dependencies from DIRT