=pro #15045 Adjust build for Scala 2.11.0

* Forward port of 2b891e7
Merge pull request #15049 from akka/wip-2.11-build-adjustments-master-patriknw

=pro #15045 Adjust build for Scala 2.11.0 (for validation)