Update test catalog.  Deactivate more tests and two sample types.
Merge pull request #315 from jfurlong/oe4.1.1

Update test catalog.  Deactivate more tests and two sample types.