HPCC-12183 Component cleanup with 12093 dependencies

Signed-off-by: Michael Gardner <Michael.Gardner@lexisnexis.com>
HPCC-12183 Fixed merge conflict

Signed-off-by: Michael Jon Gardner <Michael.Gardner@lexisnexis.com>