Merge branch '2.4' into 3.0

Conflicts:
	App/View/Errors/error400.ctp
	App/View/Errors/error500.ctp
	lib/Cake/Cache/Cache.php
	lib/Cake/Console/Command/UpgradeShell.php
	lib/Cake/Console/TaskCollection.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Controller/Component/PaginatorComponent.php
	lib/Cake/Controller/Controller.php
	lib/Cake/Core/Object.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Model/Datasource/Database/Sqlserver.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Datasource/Session.php
	lib/Cake/Network/Http/HttpSocket.php
	lib/Cake/Routing/Route/RedirectRoute.php
	lib/Cake/Routing/Route/Route.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/Case/Core/AppTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/TestApp/Plugin/TestPlugin/Log/Engine/TestPluginLog.php
	lib/Cake/Test/TestApp/View/Helper/BananaHelper.php
	lib/Cake/Test/TestApp/View/Pages/home.ctp
	lib/Cake/Test/TestApp/View/Posts/json/index.ctp
	lib/Cake/Test/TestApp/View/Posts/test_nocache_tags.ctp
	lib/Cake/Test/TestCase/Cache/CacheTest.php
	lib/Cake/Test/TestCase/Console/Command/Task/ExtractTaskTest.php
	lib/Cake/Test/TestCase/Console/TaskCollectionTest.php
	lib/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
	lib/Cake/Test/TestCase/Routing/RouterTest.php
	lib/Cake/Test/TestCase/View/Helper/PaginatorHelperTest.php
	lib/Cake/Utility/Validation.php
	lib/Cake/View/Helper/JsBaseEngineHelper.php
	lib/Cake/View/Helper/JsHelper.php
	lib/Cake/bootstrap.php