[389-commits] [389-ds-base] 01/01: Merge #49589 `merge svrcore into 389-ds-base`