Merge "Format change to align with Influxdb_hosts"