merge
Merge branch 'master' of https://github.com/okisanjp/chef-recipes

Conflicts:
	site-cookbooks/ops-tools/recipes/default.rb