Fixed unavailability of test location for scalatest 1.9.2 (SCL-5954).
Merge remote-tracking branch 'origin/master'