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