Sync with devel for updated aerocli option format support