HPCC-12183 Component Cleanup with HPCC-12093 dependencies

re-target from master to candidate-5.0.4