Merge branch 'release-0.2.2' into develop
Merge branch 'master' of github.com:indigo423/chef-opennms into develop