Merge "Accommodate service disconnect / package update race" into oc-dev