Merge branch 'rs/parse-opt-ctx-cleanup'

Code clean-up. * rs/parse-opt-ctx-cleanup: parse-options: drop unused parse_opt_ctx_t member