REPORT-450: Automatically suggest keys and labels
REPORT 450: Use dimension label rather than key for automatic indicator label
Merge branch 'REPORT-450'

Conflicts:
	omod/src/main/webapp/reports/periodIndicatorReport.jsp