The old code was wrong in that it assumed that we are out the grace
  period as soon as the client is finished doing lock recovery.
  Also ensure that we respect signals when waiting for the server grace
  period to end.