s3-selftest: re-sync with s4-selftest wscript.