HPCC-12093 component cleanup with 12183 dependent changes

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