[389-devel] please review: PR 50105 - Fix UI/CLI bugs