Merge "Fixed sonar issues in ClassLoaderUtils."