=pro update to scala 2.11.4
Merge pull request #16283 from 2m/wip-to-scala-2.11.4

=pro update to scala 2.11.4