[PATCH aeolus-cli 0/2] Refactor option parser to resolve BZ #754956