Merge pull request #18 from mancdaz/master

Merged automatically by jenkins after successful build test
End of sprint version bump.
[BUG]: pyscript plugin was not using correct collectd.plugin_dir attribute
Merge pull request #19 from galstrom21/master

Merged automatically by jenkins after successful build test
Adding type:cpu to monitoring_metric
Merge pull request #20 from galstrom21/master

Merged automatically by jenkins after successful build test
End of sprint version bump.
[BUG]: Fixing Chef deprecated warning

    WARN: Setting attributes without specifying a precedence is deprecated and will be
    removed in Chef 11.0. To set attributes at normal precedence, change code like:
    `node["key"] = "value"` # Not this
    to:
    `node.set["key"] = "value"` # This
Merge pull request #23 from galstrom21/master

Merged automatically by jenkins after successful build test
End of sprint version bump.
End of sprint version bump.
End of sprint version bump.
install instead of upgrade
Merge pull request #24 from rackerjoe/install

Merged automatically by jenkins after successful build test
End of sprint version bump.
Kill off more deprecation warnings
Merge pull request #25 from claco/kill-dep-warnings

Merged automatically by jenkins after successful build test
End of sprint version bump.
fix deprecation warning - use Chef::DSL::Recipe instead
include_recipe not directly available inside a provider context