Merge remote-tracking branch 'origin/2.10.x' into master
Merge remote-tracking branch 'origin/2.10.2' into master

* origin/2.10.x:
  SI-7375 ClassTag for value class aliases
  A test case for a recent LUB progression.
  SI-7421 remove unneeded extra-attachement in maven deploy
  SI-6138 Centralize and refine detection of `getClass` calls
  SI-7497 Fix scala.util.Properties.isMac
  SI-7473 Bad for expr crashes postfix
  Increase build.number to 2.10.3
  SI-7391 Always use ForkJoin in Scala actors on ... ... Java 6 and above (except when the porperty actors.enableForkJoin says otherwise)
  Reimplementing much of the DefaultPromise methods Optimizations: 1) Avoiding to call 'synchronized' in tryComplete and in tryAwait 2) Implementing blocking by using an optimized latch so no blocking ops for non-blockers 3) Reducing method size of isCompleted to be cheaper to inline 4) 'result' to use Try.get instead of patmat
  c.typeCheck(silent = true) now suppresses ambiguous errors

Conflicts:
  bincompat-backward.whitelist.conf
  bincompat-forward.whitelist.conf
  src/compiler/scala/reflect/macros/contexts/Typers.scala
  src/compiler/scala/reflect/reify/package.scala
  src/compiler/scala/tools/nsc/typechecker/Typers.scala
  src/compiler/scala/tools/reflect/ToolBoxFactory.scala
  src/library/scala/concurrent/impl/Promise.scala
  test/files/pos/t7517.scala

* origin/2.10.2:
  SI-7532 Fix regression in Java inner classfile reader
  SI-7517 Fix higher kinded type inference regression
  SI-7516 Revert "SI-7234 Make named args play nice w. depmet types"
  SI-7486 Regressions in implicit search.
  SI-7509 Avoid crasher as erronous args flow through NamesDefaults

Conflicts:
  src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
  src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala