Fix man pages so that long opts display correctly
in sphinx

Change-Id: I5aa2f6df9097a72660b3977a37b62e20ab3a31d0