Last minute test catalog updates for Mary.
Merge pull request #335 from jfurlong/oe4.1.1

Last minute test catalog updates for Mary.