Merge change 20858

* changes:
  Don't let bmgr leave a restore session hanging on error