Update nehrp-2020 output to match expected results. I think this has all of @cswilson @jdbrown 's updates incorporated into this Merge Request.