Updated the test suite dispatcher to allow use of PHPUnit from Composer
Merge commit 'a0851702ff281bf40c0da288c2f6e379a023b0f5'

Conflicts:
	lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
Fixes #3535
Added an option to the default CakePHP routes to allow differentiation between them and user routes.