Partial fix for SCL-6348 (Spec class from scalatest v2.0 is not supported yet).
(cherry picked from commit 9a83bc9)
#SCL-6357 fixed
Merge remote-tracking branch 'origin/master'