HTLNSP Test Catalog Updates
More test catalog changes
Additional test catalog fixes
Merge pull request #314 from jfurlong/oe4.1.1

Changes to HTLNSP test catalog