Bug 972757

Tweak validation Regexp for the broker. Underscore is now allowed.
The broker *could* potentially reuse `Manifest`'s constant, but
additional thoughts should be given before that is done. For now, we
leave the patterns as liberal as reasonable.