Merge branch '2.4' into 3.0

Conflicts:
	app/Config/core.php
	app/webroot/index.php
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Controller/Controller.php
	lib/Cake/Core/Configure.php
	lib/Cake/Core/Object.php
	lib/Cake/Model/ModelValidator.php
	lib/Cake/Routing/Route/Route.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/Case/Core/ObjectTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
	lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php
	lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
	lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
	lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
	lib/Cake/Test/TestCase/Cache/Engine/FileEngineTest.php
	lib/Cake/Test/TestCase/Cache/Engine/RedisEngineTest.php
	lib/Cake/Test/TestCase/Controller/Component/CookieComponentTest.php
	lib/Cake/Test/TestCase/Network/Email/MailTransportTest.php
	lib/Cake/Test/TestCase/Network/RequestTest.php
	lib/Cake/Test/TestCase/Routing/Route/RouteTest.php
	lib/Cake/Test/TestCase/Routing/RouterTest.php
	lib/Cake/Test/TestCase/View/Helper/HtmlHelperTest.php
	lib/Cake/TestSuite/ControllerTestCase.php
	lib/Cake/TestSuite/TestSuiteCommand.php
	lib/Cake/View/Helper.php
	lib/Cake/bootstrap.php