#1 is a resend: it just makes it so run-tests.py actually executes the test script for the "convert CVSNT mergepoints" feature. This exposes the fact that the test often fails. #2 makes the test behave the same under CVS 1.11 and 1.12: specifically, it mostly passes on slow hardware and mostly fails on fast hardware.