Conflicts:
	examples/nginx-app/package.json
	examples/nginx-app/plugin.json

(cloudwatch) support tag query

(cloudwatch) add metrics/dimensions of AWS/Events and AWS/Logs

remove extra comma in nginx-app's package.json

InfluxDB: Fix groupby selection

Default groupby selection for influxdb is escaped not like a regex, but as a glob. It works fine with one value in variable, but when you select multiple values, query is incorrect:
> SHOW TAG KEYS FROM "os.disk.fs.space_total" WHERE "host" =~ /{host-1,host-2}$/

otherwise grunt fails due to a syntax error in package.json

closes #4326

closes #4325

#4258 Implemented GetDataSourceIdByName API

Update ldap.md

fix to use variable.refresh flag

Added clearer language on which versions offer LDAP support.