Merge branch '2.5' into 3.0-merge

Conflicts:
	app/Config/Schema/db_acl.php
	app/Config/core.php
	build.xml
	lib/Cake/Test/Case/Model/ModelDeleteTest.php
	lib/Cake/Test/Case/Model/ModelWriteTest.php
	lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/Case/View/Helper/JsHelperTest.php
	lib/Cake/View/Helper/FormHelper.php
	src/Controller/Component/AuthComponent.php
	src/Event/EventManager.php
	src/Network/Email/MailTransport.php
	tests/TestCase/Console/ShellDispatcherTest.php
	tests/TestCase/Controller/Component/AclComponentTest.php
	tests/TestCase/Controller/Component/AuthComponentTest.php
	tests/TestCase/Event/EventManagerTest.php
	tests/TestCase/Network/Email/DebugTransportTest.php
	tests/TestCase/Network/Email/SmtpTransportTest.php
	tests/TestCase/Utility/ObjectCollectionTest.php
	tests/TestCase/View/ViewTest.php