Add enable/disable to MacOSX service provider

v11 version of #1267
Merge pull request #1292 from jaymzh/macosxfixes-11

Add enable/disable to MacOSX service provider