Fixed typo in var name.
Merge branch '2.5' into 3.0

Conflicts:
	Cake/Error/ExceptionRenderer.php
	Cake/Test/TestApp/View/Error/error400.ctp
	Cake/Test/TestApp/View/Error/error500.ctp
	Cake/Test/TestCase/View/Helper/FormHelperTest.php
	Cake/Test/TestCase/View/HelperTest.php
	Cake/View/Error/pdo_error.ctp
	Cake/View/Helper.php
	Cake/View/Helper/FormHelper.php
	composer.json
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Controller/Controller.php
	lib/Cake/Model/Behavior/TreeBehavior.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Test/test_app/View/Errors/error400.ctp
	lib/Cake/Test/test_app/View/Errors/error500.ctp