Merge "add cli.has_manage option"