We still have several places mentioning isd/osd even after HCATALOG-261. That give us trouble in some tests. We need to get rid of those.
This patch misses removing the ISD/OSD constants from the unit tests.
Remove isd/osd in tests as well.
moving as subtask to HCATALOG-237 for easier tracking
Patch 2 checked into trunk and branch 0.4
Issue closed with 0.4 release.