Merge branch 'merge-wip-into-2.10.x' into merge-2.10-into-master

* merge-wip-into-2.10.x: (44 commits)
  Cleanups of reifyBoundTerm and reifyBoundType
  SI-5841 reification of renamed imports
  Share the empty LinkedList between first0/last0.
  SI-4922 Show default in Scaladoc for generic methods.
  SI-6614 Test case for fixed ArrayStack misconduct.
  SI-6690 Release reference to last dequeued element.
  SI-5789 Use the ReplTest framework in the test
  SI-5789 Checks in the right version of the test
  SI-5789 Removes assertion about implclass flag in Mixin.scala
  SI-6766 Makes the -Pcontinuations:enable flag a project specific preference
  more ListOfNil => Nil
  DummyTree => CannotHaveAttrs
  evicts assert(false) from the compiler
  introduces global.pendingSuperCall
  refactors handling of parent types
  unifies approaches to call analysis in TreeInfo
  TypeApply + Select and their type-level twins
  SI-6696 removes "helper" tree factory methods
  SI-6766 Create a continuations project in eclipse
  Now the test suite runs MIMA for compatibility testing.
  ...

Conflicts:
	src/compiler/scala/reflect/reify/codegen/GenUtils.scala
	src/compiler/scala/tools/nsc/ast/Trees.scala
	src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
	src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
	src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
	src/compiler/scala/tools/nsc/typechecker/Contexts.scala
	src/compiler/scala/tools/nsc/typechecker/Namers.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/eclipse/scala-compiler/.classpath
	src/eclipse/scalap/.classpath
	src/reflect/scala/reflect/internal/StdNames.scala
	src/reflect/scala/reflect/internal/TreeInfo.scala

2 files changed, 6 insertions, 2 deletions

diff --git a/src/library/scala/collection/convert/WrapAsJava.scala b/src/library/scala/collection/convert/WrapAsJava.scala
index 9115b9e5fb..5e6126a7cf 100644
--- a/src/library/scala/collection/convert/WrapAsJava.scala
+++ b/src/library/scala/collection/convert/WrapAsJava.scala
@@ -10,10 +10,11 @@ package scala.collection
 package convert
 
 import java.{ lang => jl, util => ju }, java.util.{ concurrent => juc }
-import Wrappers._
 import scala.language.implicitConversions
 
 trait WrapAsJava {
+  import Wrappers._
+
   /**
    * Implicitly converts a Scala Iterator to a Java Iterator.
    * The returned Java Iterator is backed by the provided Scala
diff --git a/src/library/scala/collection/convert/WrapAsScala.scala b/src/library/scala/collection/convert/WrapAsScala.scala
index 5a5d204ece..ffcca62291 100644
--- a/src/library/scala/collection/convert/WrapAsScala.scala
+++ b/src/library/scala/collection/convert/WrapAsScala.scala
@@ -10,11 +10,13 @@ package scala.collection
 package convert
 
 import java.{ lang => jl, util => ju }, java.util.{ concurrent => juc }
-import Wrappers._
 import scala.language.implicitConversions
 
 trait LowPriorityWrapAsScala {
   this: WrapAsScala =>
+
+  import Wrappers._
+
   /**
    * Implicitly converts a Java ConcurrentMap to a Scala mutable ConcurrentMap.
    * The returned Scala ConcurrentMap is backed by the provided Java
@@ -34,6 +36,7 @@ trait LowPriorityWrapAsScala {
 }
 
 trait WrapAsScala extends LowPriorityWrapAsScala {
+  import Wrappers._
   /**
    * Implicitly converts a Java `Iterator` to a Scala `Iterator`.
    *