Merge back everything into one tree that does not depend on versions

The only version dependent code is the AnyRefMap test that depends
on Scala-2.11. Also embedded there is immutable.LongMap for coverage