[TIMOB-16522] Added option value boolean checks in case the option was mistaken for a flag.
Merge pull request #5924 from cb1kenobi/timob-16522

[TIMOB-16522] Added option value boolean checks in case the option was mistaken for a flag.