'-h' is the preferred short version of '--help' now and displayed
in '--help' but for backwards compatibility '-?' is still supported.

If existing code uses '-h' for something else, GOptionContext will
not override it.

Fixes bug 556706.