merge #15889: make regrtest --start succeed in more cases.

Patch by Chris Jerdonek.