Remove missed bit-rot from rebasing

Missed some version control conflict markers adding although
commented-out during earlier rebasing.  Also, make XactLockTableWait()
indicate that we're going to lock a heap tuple when waiting on an
in-progress transaction, which seems better in line with the new regime
where the user gets some feedback on such details.