Merge "Handle disabled packages as removed." into oc-dev