Merge branch '2.4' into 3.0

Conflicts:
	app/Config/core.php
	lib/Cake/Console/cake.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/TestCase/Routing/RouterTest.php