Deprecate '_' in YAML

Mixing '-' and '_' for keywords in the same file can be confusing.
Deprecate remaining instances of '_' in favor of alternatives that
use '-'.

Change-Id: I1e8af0d5396dd24b45b024a2897f61f8745a8e1f