Update the auto-discovery scripts.

Refs #5856