[Security] Fixed tests
Merge branch '2.5' into 2.6

* 2.5:
  [Security] Fixed tests
  [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.