Roll back Ivy to 2.3.0 for 0.13.5
Fix resolving Select(ThisProject)
Add scripted test to verify ThisProject is resolved properly
JDK8 compat issue, MaxPermSize removed since JDK 8
Merge pull request #1357 from sbt/wip/roll-back-ivy

Roll back Ivy to 2.3.0 for 0.13.5 for #1356
Changed to combine SuiteResult with same name, instead of replacing with latest one. This solves the test result count problem when a Suite is executed more than 1 time due to being returned as nested suites (sub-task).
Merge pull request #1364 from scalatest/test-result-acc-count

Accumulate Test Count
0.13.5 release.
Read stderr from server for a short time before exiting

Previously we exited immediately without waiting to get any
error output.

This patch also adds the command line and directory to the
exception message on failure, in case the failure is due to
getting one of those wrong, for example.
Fix import issues to generate sxr/scaladoc.
Merge remote-tracking branch 'origin/0.13.5' into wip/fix-doc-generation

Conflicts:
	project/Sbt.scala
Fix formatting issues and bump to sbt 0.13.5
Fix bug in release script due to typo.

* Fix collection typo
* Create shared command to setup 2.11 builds
* Alter snapshot detection to allow more flexible milestone versioning.
* Remove cusotm isSnapshot key for new sbt 0.13.2 isSnapshot key.
Merge pull request #1359 from ancientrock/jdk8-tip

JDK8 compat issue, MaxPermSize removed since JDK 8
Merge pull request #1358 from dansanduleac/issue/1194

Resolve ThisProject properly
Revert "Load global plugins in their own class loader and replace the base loader with that.  Fixes #272."

This reverts commit 8cb7e230110e846b577539e61757e815f083294e.

Conflicts:
	main/src/main/scala/sbt/Load.scala
Re-add scripted test
build projects' transitiveUpdate to depend on globalPluginUpdate
Make GlobalPluginData preserve compatibility wrt .unapply
ServerApplication: yield before we check on the dumper thread