Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10

* origin/2.10.0-wip:
  MethodSymbol.params => MethodSymbol.paramss
  SI-6471 Update jquery from 1.4.2 to 1.8.2
  undeprecates manifests for 2.10.0
  SI-6451: Rename classes in `unchecked-abstract.scala` test.
  Put more implementation restrictions on value classes.
  Fixed problem in SI-6408
  Revised restrictions for value classes and unversal traits
  SI-6436 Handle ambiguous string processors
  fixes a bug in a weak cache in runtime reflection

Conflicts:
	test/files/neg/classmanifests_new_deprecations.check
	test/files/neg/unchecked-abstract.check

2 files changed, 25 insertions, 0 deletions

diff --git a/test/pending/run/t5882.scala b/test/pending/run/t5882.scala
new file mode 100644
index 0000000000..47996d3068
--- /dev/null
+++ b/test/pending/run/t5882.scala
@@ -0,0 +1,14 @@
+// SIP-15 was revised to allow nested classes in value classes.
+// This test checks that their basic functionality.
+
+class NodeOps(val n: Any) extends AnyVal { self =>
+  class Foo() { def show = self.show(n) }
+  def show(x: Any) = x.toString
+}
+
+
+object Test extends App {
+
+  val n = new NodeOps("abc")
+  assert(new n.Foo().show == "abc")
+}
diff --git a/test/pending/run/t6408.scala b/test/pending/run/t6408.scala
new file mode 100644
index 0000000000..ff17480b35
--- /dev/null
+++ b/test/pending/run/t6408.scala
@@ -0,0 +1,11 @@
+class X(val i: Int) extends AnyVal {
+  class Inner(val q: Int) {
+    def plus = i + q
+  }
+}
+
+object Test extends App {
+  val x = new X(11)
+  val i = new x.Inner(22)
+  assert(i.plus == 33)
+}