add code to merge one user with another
Add deleting person rows in merge
set the mpdtool db name only in the begin/rescue since moose server has no mpdtool db
improve merge code
reference top-level classes instead of modules
also update cim_reg_eventadmin on merge
Revert "also update cim_reg_eventadmin on merge"

This reverts commit 6f0c393618e488a9ed797206c60ea977136c8a2a.
update merge to capture sql errors but to keep going with the merge