Merge in changes for active-active service types, specifically osg

Fixes services_up_test to not require ENABLED/DISABLED pair when multiple OSGs detected.