HPCC-12183 Component cleanup with 12093 dependencies

Signed-off-by: Michael Gardner <Michael.Gardner@lexisnexis.com>
Merge pull request #6510 from Michael-Gardner/HPCC-12183

HPCC-12183 Component cleanup with 12093 dependencies

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>