LPS-39904 handling situation where we are not adding the context class loader