Updates NTO severity mappings to match scanner values.
Fixes NTO scan test.
Fixing #683, #672: x axis time range in trending report
Merge branch 'sbir-phase2' into 2.2i3
Merge branch '2.2i3', remote-tracking branch 'origin' into qa-sprint