Make sure :disabled_plugins can disable both v6 and v7 plugins.
Merge pull request #247 from opscode/OC-10161

Make sure :disabled_plugins can disable both v6 and v7 plugins.