merge with stable
This should correct an earlier couple of bad merges (5433856b2558 and
596960a4ad0d, now pruned) that accidentally brought in a change that had
been marked obsolete (244ac996a821).
Testing that hghave does not crash when checking features $ "$TESTDIR/hghave" --test-features 2>/dev/null