backports https://github.com/scala/scala/pull/3657
fixes for tests broken in master