Merge branch '2.4' into 3.0

Conflicts:
	lib/Cake/Controller/Component/Acl/PhpAcl.php
	lib/Cake/Core/App.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Network/Email/Email.php
	lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Fixture/CakeSessionFixture.php
	lib/Cake/Test/Fixture/SessionFixture.php
	lib/Cake/Test/Fixture/UuidTreeFixture.php
	lib/Cake/Test/TestCase/Controller/Component/RequestHandlerComponentTest.php
	lib/Cake/Test/TestCase/Controller/ScaffoldTest.php
	lib/Cake/Test/TestCase/Routing/Route/RouteTest.php
	lib/Cake/Test/TestCase/Routing/RouterTest.php
	lib/Cake/Test/test_app/Model/Datasource/Database/TestLocalDriver.php
	lib/Cake/Test/test_app/View/Pages/home.ctp
	lib/Cake/Utility/Debugger.php
	lib/Cake/View/Helper/CacheHelper.php
	lib/Cake/bootstrap.php