Merge branch '2.6' into 3.0

Conflicts:
	app/Config/Schema/db_acl.php
	app/Config/Schema/db_acl.sql
	app/Console/cake.php
	lib/Cake/Console/Command/UpgradeShell.php
	lib/Cake/Console/ShellDispatcher.php
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Core/App.php
	lib/Cake/Model/AclNode.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/ModelValidator.php
	lib/Cake/Model/Validator/CakeValidationSet.php
	lib/Cake/Test/Case/Core/AppTest.php
	lib/Cake/TestSuite/Coverage/BaseCoverageReport.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/View/Helper/JqueryEngineHelper.php
	lib/Cake/View/Helper/MootoolsEngineHelper.php
	lib/Cake/View/Helper/PrototypeEngineHelper.php
	src/Cache/Engine/ApcEngine.php
	src/Configure/Engine/IniConfig.php
	src/Configure/Engine/PhpConfig.php
	src/Console/ConsoleOptionParser.php
	src/Network/Email/Email.php
	src/Network/Request.php
	src/View/View.php
	tests/TestCase/Network/RequestTest.php
	tests/TestCase/View/Helper/HtmlHelperTest.php
	tests/TestCase/View/ViewTest.php