[389-devel] Plan for merge of lib389 and svrcore