Merge pull request #1779 from paulp/pr/no-pickle-skolems

Deskolemize type skolems before pickling.
Merge pull request #1759 from scalamacros/topic/annotated

fixes incorrect handling of Annotated in lazy copier
Merge pull request #1727 from scalamacros/ticket/6548

SI-6548 reflection now correctly enters jinners
Eliminating var-like setter tpe_= on Tree.

Deprecated tpe_= on Tree, which is redundant with and
less useful than setType. To provide a small layer of
insulation from the direct nulling out of mutable fields
used to signal the typer, added def clearType() which is
merely tree.tpe = null but is shamefaced about the null
and var-settings parts like a respectable method should be.
Merge pull request #1709 from retronym/ticket/3995

SI-3995 Exclude companions with an existential prefix.
Merge pull request #1772 from gkossakowski/global-deadcode

Remove dead code from `Global`.
Merge pull request #1771 from vigdorchik/si_6605

Cleanup MemberLookup. Better explain ambiguous link targets.
Merge pull request #1778 from JamesIry/p_SI-6795_2.10.x

SI-6795 simplify "abstract override" errors on type members
Merge pull request #1784 from paulp/pr/is-name-in-scope

Integrate isNameInScope in Contexts.
Merge remote-tracking branch 'origin/2.10.0-wip' into 2.10.0-wip-merge

# By Eugene Burmako (1) and others
# Via Adriaan Moors (2) and others
* origin/2.10.0-wip:
  Fixing OSGi distribution.
  Fix for rangepos crasher.
  SI-6685 fixes error handling in typedApply
Merge pull request #1768 from paulp/pr/one-way-to-set-type

Eliminating var-like setter tpe_= on Tree.
Correct whitespace in `ASMTransformer.java`.

Let's stick to 2 spaces for indentation (and no tabs).
Set `canRetransform` flag to `false` in instrumentation.

We do not need to retransform classes once they are loaded.
All instrumentation byte-code is pushed at loading time.

This fixes a problem with Java 7 that was failing to add
a transformer because we did not declare retransformation
capability in `MANIFEST.MF` file in Java agent jar.
Java 6 allowed to add transformer due to a bug.
Do not recompute stack frames when instrumenting bytecode.

It turns out that we do not need to do that. See comment in
`ProfilerVisitor.java`. Also, since recomputing stack frame
map was the only reason we needed to implement
`getCommonSuperClass` we can now remove its implementation
that was causing problems on Java 7 due to a cyclic dependency
involving class loader because we would try to load a class
we are currently transforming and transformer is triggered just
before classloading.

//cc @namin who worked on this code with me.
Merge pull request #1788 from retronym/ticket/6848

Implicit vars should have non-implicit setters.
Stream.zip naturalsEx example does not compile => remove extra zip call
Fix scaladoc typo for isTerm method
Merge pull request #1791 from paulp/pr/fix-java7

fixing test suite on java7
Fix Iterator#copyToArray (fixes SI-6827).

As pointed out in #scala, when using a non-zero start it's possible
to get an ArrayIndexOutOfBoundsException due to an incorrect bounds
check. This patch fixes this, as well as another potential bounds
error, and adds test cases.

Incorporates some other suggestions by Som-Snytt to ensure that
callers will get useful error messages in cases where the start
parameter is wrong (negative or out-of-array-bounds).

Review by @som-snytt.
Merge pull request #1790 from paulp/2.10.0-wip-merge

Merge 2.10.0-wip into 2.10.x