Merge branch 'release-chef-11.10' of github.com:silinternational/opsworks-cookbooks into release-chef-11.10