fix metric name (error was due to the colon), and metric name so that it includes SWC, portal version, and exception type name
Merge pull request #1342 from jay-hodgson/SWC-1836-updated

SWC-1836: fix metric name (error was due to the colon), and metric name so that it...