reporting:  Additional changes for supporting exposing reporting data definitions as calculations.  See REPORT-461 (additional fix missed out in last commit)