updated for Scala 2.10 + cleanup
Test for SCL-5562