Merge remote-tracking branch 'origin/2.4' into 3.0

Conflicts:
	app/Config/core.php
	lib/Cake/Console/Shell.php
	lib/Cake/Controller/Component/Auth/BasicAuthenticate.php
	lib/Cake/Core/App.php
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Network/Http/HttpSocket.php
	lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
	lib/Cake/Test/TestCase/Console/Command/Task/ModelTaskTest.php
	lib/Cake/Test/TestCase/Controller/Component/AuthComponentTest.php
	lib/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
	lib/Cake/Test/TestCase/Error/ErrorHandlerTest.php
	lib/Cake/Test/TestCase/View/Helper/HtmlHelperTest.php
	lib/Cake/TestSuite/TestSuiteDispatcher.php
	lib/Cake/Utility/Validation.php
	lib/Cake/View/Helper/HtmlHelper.php