Fixes #2398 Conflicts: lib/Cake/Test/Case/Console/Command/ShellTest.php Signed-off-by: mark_story <mark@mark-story.com>