Merge branch '2.4' into 3.0

Conflicts:
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/Session.php
	lib/Cake/Test/TestApp/View/Posts/test_nocache_tags.ctp
	lib/Cake/Test/TestCase/Cache/Engine/ApcEngineTest.php