Improve workaround for Sphinx's lack of support for command line options...

Improve workaround for Sphinx's lack of support for command line options containing '+', '.' etc. to be more stable as the set of options changes.

llvm-svn: 293252