Merge branch 'master' into tn/ohai-int-test
Modified OhaiPluginCommon to load Ohai7 plugins
fix OhaiPluginCommon
Workaround for 'depend' not functioning