Merge pull request #123 in AD/qrp_report from DEV-19846 to staging
* commit '4575bbdcb607c9b28bb908e367f6c7bad23c6371':
DEV-19846: cleaned up define and columns statement, removed errant column in overall table
DEV-19846: update formatting to match rest of report, order of groups, data on same line for overall table
