Merge branch '2.5' into 3.0-merge

Conflicts:
	build.xml
	lib/Cake/Console/Command/SchemaShell.php
	lib/Cake/Console/Command/UpgradeShell.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
	lib/Cake/Test/Case/Core/CakePluginTest.php
	lib/Cake/Test/Case/Core/ObjectTest.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
	lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
	lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
	lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
	lib/Cake/Test/Case/Utility/StringTest.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/View/Helper/PaginatorHelper.php
	src/Controller/Component/AuthComponent.php
	src/Network/Request.php
	src/Routing/Route/Route.php
	src/Utility/Time.php
	tests/TestCase/Network/RequestTest.php
	tests/TestCase/Routing/RouterTest.php
	tests/test_app/TestApp/Template/Layout/Email/html/default.ctp
	tests/test_app/TestApp/Template/Layout/Email/html/japanese.ctp
	tests/test_app/TestApp/Template/Layout/Email/html/thin.ctp
	tests/test_app/TestApp/Template/Layout/cache_empty_sections.ctp
	tests/test_app/TestApp/Template/Layout/default.ctp