[KFSQA-838] Preliminary work, merged so others can use it while I finish up the last couple of steps.
[KFSQA-838] Found a surprising issue during test run. Here is the hotfix so my commits should not break the build tonight. (fingers crossed)
[KFSQA-838] Fixed some merge-related errors.
Fixed some stuff that wasn't working on the nightly run.
[KFSQA-916] Merging changes for wildcarded indirect cost recovery rate test.
[KFSQA-838] Fixed some small issues that were not dealt with in the preliminary work. ICRA Tab elements should be more in-line with standards now.
[KFSQA-919] merged from master