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.