scala: Bump to 2.11.0, bump 2.10 to 2.10.4
Merge pull request #2520 from CodeBlock/scala

scala: Bump to 2.11.0, bump 2.10 to 2.10.4