resolved merge conflicts with flux-0.7
resolved merge conflicts with flux-0.7

influxdata/docs.influxdata.com,influxdata/docs.influxdata.com,influxdb/docs.influxdata.com,influxdb/docs.influxdata.com,influxdata/docs.influxdata.com,influxdata/docs.influxdata.com,influxdb/docs.influxdata.com,influxdata/docs.influxdata.com