Add removeSubcommand in ConsoleOptionParser
Typo fix
Merge branch '2.6-remove-subcommand' into 2.6

Merge changes from cakephp/cakephp#4039 into 2.6. This will effectively
backports the changes to 2.6, and allows them to be merged into 3.0 at
the same time.

Closes #4039