KRACOEUS-8458 cleaning up inactivation flag.  This should improve consistency, and maybe perf.
KRACOEUS-8531:added F&A rates to proposal budget summary
KRACOEUS-8532:changed activity type field label in hierarchy summary
Merge pull request #1279 from jhulslander/KRACOEUS-8458-knsRedirect

KRACOEUS-8458 cleaning up inactivation flag.  This should improve consis...
Merge pull request #1282 from jwillia/KRACOEUS_8532_1

KRACOEUS-8532:changed activity type field label in hierarchy summary
Merge pull request #1281 from jwillia/KRACOEUS_8531_1

KRACOEUS-8531:added F&A rates to proposal budget summary