Merge "fs_mgr: error check umount calls / add retry logic"