Import opscode-cookbooks/aws version f84de5cccb922f056b0c99a5e3b35328646d95b5
Merge branch 'master' into mysql_recipe