Remove an option starting an uppercase character so that the test does not depends on sort order.
Revert "Option parsing: support case-insensitive option matching." as it broke Windows buildbot.

This reverts r189416.