[TIMOB-14019] Fixed some argument parsing order to properly support unknowns
Merge pull request #207 from bryan-m-hughes/timob-14019-1_0_X

[TIMOB-14019] Fixed some argument parsing order to properly support unknowns