Merge "BUG-868: migrate ClassLoaderUtils user"