Merge "Strip hyphens from hostname when generating /tmp/serial."