Merge in AD/qrp_report from DEV-20841 to staging
* commit '523e3b0077bfc6148184e656eb2665dcbe4e2652':
DEV-20841 N/A conditiional to dennum
DEV-20841 Modif following QC
Revert "DEV-20841 Remove levelid as macro parameter"
Revert "DEV-20841 Fix bad merge"
DEV-20841 Fix bad merge
DEV-20841 Remove levelid as macro parameter
Fix N/A when outputdenom = M