fix for not using --keyfile specified in an options file

Had some leftover magic in command_line_parser that needed to be moved to general parsing so that it is also used for options file parsing.