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

* Forward port of 2b891e7