SCL-2

Fixup 
-
* fix some warnings for Scala 2.11

QA
-
There is still some warnings
* Not a simple type -> https://issues.scala-lang.org/browse/SI-7701
```scala
[warn] Transformed: class xsbti.api.Structure
[warn] Not a simple type:
````