SAMZA-352: Scala 2.9.2 build broken after SAMZA-337
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-samza