[LOGMGR-83] Close handlers on rollback during add.

Also added fixes to fix issues with previous cherry-picks