r21733: Merge testenv back into core selftest.pl