Merge "BUG-868: move to use unified ClassLoaderUtils"