Updates to IMS/OMS and related tests to address OOIION-1396.
Merge pull request #1594 from edwardhunter/OOIION1396_rebase2

Updates to IMS/OMS and related tests to address OOIION-1396.