KARAF-2772 Moving some util classes and test to simplify separation
KARAF-2772 Moving some util classes and test to simplify separation. Forgot some mods