PRD-3965 unified feature commit
Merge pull request #20 from gretchiemoran/PRD-3965_Merge

PRD-3965 unified feature commit
PRD-3965 Fix for failing test
PRD-3965 fix missing dependency breaking build
PRD-4434: Cell formatting lost on export to excel. Fix + test report.
Merge pull request #21 from tmorgner/Prd-4434

PRD-4434: Cell formatting lost on export to excel. Fix + test report.