Merge remote-tracking branch 'upstream/stabilization' into merge-stabilization-into-master20160227-160016

Conflicts:
	Makefile
	cibuild.cmd
	src/Compilers/CSharp/CscCore/project.lock.json
	src/Compilers/CSharp/Test/Performance/project.lock.json
	src/Compilers/CSharp/Test/Syntax/project.lock.json
	src/Compilers/CSharp/csc/project.json
	src/Compilers/CSharp/csc/project.lock.json
	src/Compilers/Core/MSBuildTask/Portable/project.lock.json
	src/Compilers/Core/Portable/project.lock.json
	src/Compilers/Server/PortableServer/project.lock.json
	src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs
	src/Compilers/Test/Utilities/CSharp/project.lock.json
	src/Compilers/VisualBasic/Test/Performance/project.lock.json
	src/Compilers/VisualBasic/VbcCore/project.lock.json
	src/Compilers/VisualBasic/vbc/project.json
	src/Compilers/VisualBasic/vbc/project.lock.json
	src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.lock.json
	src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.lock.json
	src/EditorFeatures/CSharpTest/project.lock.json
	src/EditorFeatures/CSharpTest2/project.lock.json
	src/EditorFeatures/Test/project.lock.json
	src/EditorFeatures/Test2/project.lock.json
	src/EditorFeatures/Text/project.lock.json
	src/EditorFeatures/VisualBasicTest/project.lock.json
	src/Interactive/CsiCore/project.lock.json
	src/Interactive/EditorFeatures/CSharp/project.lock.json
	src/Interactive/EditorFeatures/Core/project.lock.json
	src/Interactive/EditorFeatures/VisualBasic/project.lock.json
	src/Interactive/Features/project.lock.json
	src/Interactive/Host/project.lock.json
	src/Interactive/HostTest/project.lock.json
	src/Interactive/VbiCore/project.lock.json
	src/Interactive/csi/project.lock.json
	src/Interactive/vbi/project.lock.json
	src/InteractiveWindow/EditorTest/project.lock.json
	src/Scripting/CSharp/project.lock.json
	src/Scripting/CSharpTest.Desktop/project.lock.json
	src/Scripting/CSharpTest/project.lock.json
	src/Scripting/Core/project.lock.json
	src/Scripting/CoreTest.Desktop/project.lock.json
	src/Scripting/CoreTest/project.lock.json
	src/Scripting/VisualBasic/project.lock.json
	src/Scripting/VisualBasicTest.Desktop/project.lock.json
	src/Scripting/VisualBasicTest/project.lock.json
	src/Test/DeployDesktopTestRuntime/project.lock.json
	src/Test/Diagnostics/project.lock.json
	src/Test/Utilities/Portable/project.lock.json
	src/Test/Utilities/Runtime.FX46/project.json
	src/VisualStudio/CSharp/Impl/project.lock.json
	src/VisualStudio/CSharp/Repl/project.lock.json
	src/VisualStudio/CSharp/Test/project.lock.json
	src/VisualStudio/Core/Def/project.lock.json
	src/VisualStudio/Core/Impl/project.lock.json
	src/VisualStudio/Core/SolutionExplorerShim/project.lock.json
	src/VisualStudio/Core/Test/project.lock.json
	src/VisualStudio/InteractiveServices/project.lock.json
	src/VisualStudio/Setup/project.lock.json
	src/VisualStudio/SetupInteractive/project.lock.json
	src/VisualStudio/VisualBasic/Impl/project.lock.json
	src/VisualStudio/VisualBasic/Repl/project.lock.json
	src/VisualStudio/VisualStudioDiagnosticsToolWindow/project.lock.json
	src/VisualStudio/VisualStudioInteractiveComponents/project.lock.json