Die, underscores, die!

Switch underscores to dashes in clientv2 options.

Reviewed at https://reviews.apache.org/r/19505/