Merge in AD/qrp_report from DEV-31868 to staging
* commit 'ac84e251a9daa0586bc77cbd33fba3b958468c41':
git commit -m DEV-31868: Mirrored the tablescolumnsfile edits from the input file repo"
DEV-31868: Reordered variables
DEv-31868: Updated tablecolumns file