Merge pull request #328 from pfschwartz/oe4.1.1

restored reflex tests
Add DBS Charge Virale panel and deactivate Ecouvillon Nasal sample type.  Add DBS Charge Virale tests.
Merge pull request #329 from jfurlong/oe4.1.1

Add DBS Charge Virale panel and deactivate Ecouvillon Nasal sample type....
Last minute test catalog updates for Mary.
Merge pull request #335 from jfurlong/oe4.1.1

Last minute test catalog updates for Mary.
Fix result types for VIH-1 Charge Virale DBS Panel choices
Correction before deploying last commit.
Merge pull request #336 from jfurlong/oe4.1.1

Oe4.1.1
Quick fixes for Panel VIH-1 Charge Virale DBS again and add sort_order value for PCR test.
Merge pull request #337 from jfurlong/oe4.1.1

Quick fixes for Panel VIH-1 Charge Virale DBS again and add sort_order v...
Remove results so that prior commit runs.  Sanity never came my way....
Merge pull request #338 from jfurlong/oe4.1.1

Remove results so that prior commit runs.  Sanity never came my way....
Update uom on two tests (Compte des Globules Blancs and Plaquettes Sang Total)
Add normal ranges.
Merge pull request #339 from jfurlong/oe4.1.1

Update uom on two tests (Compte des Globules Blancs and Plaquettes Sang ...
Final in Haiti test catalog update
Merge pull request #342 from jfurlong/oe4.1.1

Final in Haiti test catalog update
Fix code to speed up query for workplan by test report.
Merge pull request #366 from jfurlong/oe4.1.1

Fix code to speed up query for workplan by test report.
Fix slow ActivityReport.