Refactor the TCCL processing to ClassLoaderContext Handle the OSGi service un-registration gracefully