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

@jamie-cyber1
@mauricemanning
@mmeisinger