[389-devel] Commit: two retro cl patches