Merge branch 'c4c.staging.discover-v2' into pulse_cdm

Conflicts:
	db/development_structure.sql
Add discover report permissions
Merge branch 'c4c.staging.discover-v2' into c4c.staging

Conflicts:
	db/development_structure.sql
Add discover report permissions (missed migration file)
Merge branch 'c4c.staging.discover-v2' into c4c.staging