Don't use underscores in disk device names

[Robsteranium]

To support GCP snapshot/ restore for disaster recovery, the disks need to have device names without underscores (hyphens are ok) - e.g. elasticsearch_data