OS-2418 Add zone completion to more commands