=pro #15045 Adjust build for Scala 2.11.0
Merge pull request #15046 from akka/wip-2.11-build-adjustments-patriknw

=pro #15045 Adjust build for Scala 2.11.0