Merge pull request #326 from opscode/sersut/disable-fix

Move :disabled_plugin check for plugins to running time of the plugins
Merge pull request #327 from opscode/disable-fix-master

FW port :disabled_plugin check to the master