Update auto-discovery scripts.

Refs #5878