Better error messages for topology recovery failures
merge bug26188 into stable
merge stable into default