SAMZA-162; remove scala 2.8 cludge in kv store