Merge "Fix a security exception when unbinding services" into oc-dev