Small fix ( Getopt output formatting)
(cherry picked from commit 8b78628)
(cherry picked from commit b4c14ef)