Add enable/disable to MacOSX service provider

We've been running this code live for a long time.
Merge pull request #1267 from jaymzh/macosxfixes-10

Add enable/disable to MacOSX service provider